https://github.com/adrian-prantl updated
https://github.com/llvm/llvm-project/pull/83501
>From 4aeccd664633af57f12bfb7d0edada78c09a951e Mon Sep 17 00:00:00 2001
From: Adrian Prantl <apra...@apple.com>
Date: Mon, 4 Mar 2024 16:07:44 -0800
Subject: [PATCH 1/3] Change the return type of
ValueObject::CalculateNumChildren to uint64_t.
This is to enforce consistency across all APIs inside LLDB.
---
lldb/include/lldb/Core/ValueObject.h | 2 +-
lldb/include/lldb/Core/ValueObjectCast.h | 2 +-
lldb/include/lldb/Core/ValueObjectChild.h | 2 +-
lldb/include/lldb/Core/ValueObjectConstResult.h | 2 +-
lldb/include/lldb/Core/ValueObjectDynamicValue.h | 2 +-
lldb/include/lldb/Core/ValueObjectMemory.h | 2 +-
lldb/include/lldb/Core/ValueObjectRegister.h | 4 ++--
lldb/include/lldb/Core/ValueObjectSyntheticFilter.h | 2 +-
lldb/include/lldb/Core/ValueObjectVTable.h | 2 +-
lldb/include/lldb/Core/ValueObjectVariable.h | 2 +-
lldb/include/lldb/Target/StackFrameRecognizer.h | 2 +-
lldb/source/Core/ValueObjectCast.cpp | 2 +-
lldb/source/Core/ValueObjectChild.cpp | 2 +-
lldb/source/Core/ValueObjectConstResult.cpp | 2 +-
lldb/source/Core/ValueObjectDynamicValue.cpp | 2 +-
lldb/source/Core/ValueObjectMemory.cpp | 2 +-
lldb/source/Core/ValueObjectRegister.cpp | 4 ++--
lldb/source/Core/ValueObjectSyntheticFilter.cpp | 2 +-
lldb/source/Core/ValueObjectVTable.cpp | 4 ++--
lldb/source/Core/ValueObjectVariable.cpp | 2 +-
20 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lldb/include/lldb/Core/ValueObject.h
b/lldb/include/lldb/Core/ValueObject.h
index 4c0b0b2dae6cd4..5f0b0265d87e8d 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -958,7 +958,7 @@ class ValueObject {
int32_t synthetic_index);
/// Should only be called by ValueObject::GetNumChildren().
- virtual size_t CalculateNumChildren(uint32_t max = UINT32_MAX) = 0;
+ virtual uint64_t CalculateNumChildren(uint64_t max = UINT32_MAX) = 0;
void SetNumChildren(size_t num_children);
diff --git a/lldb/include/lldb/Core/ValueObjectCast.h
b/lldb/include/lldb/Core/ValueObjectCast.h
index fe053c12d9c343..a758c31cfd5ae8 100644
--- a/lldb/include/lldb/Core/ValueObjectCast.h
+++ b/lldb/include/lldb/Core/ValueObjectCast.h
@@ -33,7 +33,7 @@ class ValueObjectCast : public ValueObject {
std::optional<uint64_t> GetByteSize() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueType GetValueType() const override;
diff --git a/lldb/include/lldb/Core/ValueObjectChild.h
b/lldb/include/lldb/Core/ValueObjectChild.h
index 46b14e6840f0dc..5c8ebc524a4725 100644
--- a/lldb/include/lldb/Core/ValueObjectChild.h
+++ b/lldb/include/lldb/Core/ValueObjectChild.h
@@ -39,7 +39,7 @@ class ValueObjectChild : public ValueObject {
lldb::ValueType GetValueType() const override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
ConstString GetTypeName() override;
diff --git a/lldb/include/lldb/Core/ValueObjectConstResult.h
b/lldb/include/lldb/Core/ValueObjectConstResult.h
index d61df859bebce4..70785a0e149065 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResult.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResult.h
@@ -67,7 +67,7 @@ class ValueObjectConstResult : public ValueObject {
lldb::ValueType GetValueType() const override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
ConstString GetTypeName() override;
diff --git a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
index 2758b4e5bb564d..04726d4847c741 100644
--- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@@ -43,7 +43,7 @@ class ValueObjectDynamicValue : public ValueObject {
ConstString GetDisplayTypeName() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueType GetValueType() const override;
diff --git a/lldb/include/lldb/Core/ValueObjectMemory.h
b/lldb/include/lldb/Core/ValueObjectMemory.h
index 3c01df388d2e6d..37df403257e91e 100644
--- a/lldb/include/lldb/Core/ValueObjectMemory.h
+++ b/lldb/include/lldb/Core/ValueObjectMemory.h
@@ -47,7 +47,7 @@ class ValueObjectMemory : public ValueObject {
ConstString GetDisplayTypeName() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueType GetValueType() const override;
diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h
b/lldb/include/lldb/Core/ValueObjectRegister.h
index 2e47eee3d7f793..61126905b469f5 100644
--- a/lldb/include/lldb/Core/ValueObjectRegister.h
+++ b/lldb/include/lldb/Core/ValueObjectRegister.h
@@ -47,7 +47,7 @@ class ValueObjectRegisterSet : public ValueObject {
ConstString GetQualifiedTypeName() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
ValueObject *CreateChildAtIndex(size_t idx, bool synthetic_array_member,
int32_t synthetic_index) override;
@@ -95,7 +95,7 @@ class ValueObjectRegister : public ValueObject {
ConstString GetTypeName() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
bool SetValueFromCString(const char *value_str, Status &error) override;
diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
index 67596232eafd1e..e0b7c11d3a6aa7 100644
--- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
@@ -47,7 +47,7 @@ class ValueObjectSynthetic : public ValueObject {
bool MightHaveChildren() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueType GetValueType() const override;
diff --git a/lldb/include/lldb/Core/ValueObjectVTable.h
b/lldb/include/lldb/Core/ValueObjectVTable.h
index 217ff8d0d334ce..e89b84f61530fa 100644
--- a/lldb/include/lldb/Core/ValueObjectVTable.h
+++ b/lldb/include/lldb/Core/ValueObjectVTable.h
@@ -64,7 +64,7 @@ class ValueObjectVTable : public ValueObject {
std::optional<uint64_t> GetByteSize() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
ValueObject *CreateChildAtIndex(size_t idx, bool synthetic_array_member,
int32_t synthetic_index) override;
diff --git a/lldb/include/lldb/Core/ValueObjectVariable.h
b/lldb/include/lldb/Core/ValueObjectVariable.h
index bba28ce567b2a0..bad19efc0e9d5c 100644
--- a/lldb/include/lldb/Core/ValueObjectVariable.h
+++ b/lldb/include/lldb/Core/ValueObjectVariable.h
@@ -46,7 +46,7 @@ class ValueObjectVariable : public ValueObject {
ConstString GetDisplayTypeName() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueType GetValueType() const override;
diff --git a/lldb/include/lldb/Target/StackFrameRecognizer.h
b/lldb/include/lldb/Target/StackFrameRecognizer.h
index 419f0c0aac1f86..fda1924b20ed58 100644
--- a/lldb/include/lldb/Target/StackFrameRecognizer.h
+++ b/lldb/include/lldb/Target/StackFrameRecognizer.h
@@ -164,7 +164,7 @@ class ValueObjectRecognizerSynthesizedValue : public
ValueObject {
m_value = m_parent->GetValue();
return true;
}
- size_t CalculateNumChildren(uint32_t max = UINT32_MAX) override {
+ uint64_t CalculateNumChildren(uint64_t max = UINT32_MAX) override {
return m_parent->GetNumChildren(max);
}
CompilerType GetCompilerTypeImpl() override {
diff --git a/lldb/source/Core/ValueObjectCast.cpp
b/lldb/source/Core/ValueObjectCast.cpp
index 0882d4b3677619..eb93aba12819c7 100644
--- a/lldb/source/Core/ValueObjectCast.cpp
+++ b/lldb/source/Core/ValueObjectCast.cpp
@@ -41,7 +41,7 @@ ValueObjectCast::~ValueObjectCast() = default;
CompilerType ValueObjectCast::GetCompilerTypeImpl() { return m_cast_type; }
-size_t ValueObjectCast::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectCast::CalculateNumChildren(uint64_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(
true, &exe_ctx);
diff --git a/lldb/source/Core/ValueObjectChild.cpp
b/lldb/source/Core/ValueObjectChild.cpp
index 39067387dc9782..9fe6dc667bf34d 100644
--- a/lldb/source/Core/ValueObjectChild.cpp
+++ b/lldb/source/Core/ValueObjectChild.cpp
@@ -49,7 +49,7 @@ lldb::ValueType ValueObjectChild::GetValueType() const {
return m_parent->GetValueType();
}
-size_t ValueObjectChild::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectChild::CalculateNumChildren(uint64_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
diff --git a/lldb/source/Core/ValueObjectConstResult.cpp
b/lldb/source/Core/ValueObjectConstResult.cpp
index 693da1a551f8eb..8dd7f0ec1028f6 100644
--- a/lldb/source/Core/ValueObjectConstResult.cpp
+++ b/lldb/source/Core/ValueObjectConstResult.cpp
@@ -216,7 +216,7 @@ std::optional<uint64_t>
ValueObjectConstResult::GetByteSize() {
void ValueObjectConstResult::SetByteSize(size_t size) { m_byte_size = size; }
-size_t ValueObjectConstResult::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectConstResult::CalculateNumChildren(uint64_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
diff --git a/lldb/source/Core/ValueObjectDynamicValue.cpp
b/lldb/source/Core/ValueObjectDynamicValue.cpp
index e6e30dce9d1e4a..784180b0ef9017 100644
--- a/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -85,7 +85,7 @@ ConstString ValueObjectDynamicValue::GetDisplayTypeName() {
return m_parent->GetDisplayTypeName();
}
-size_t ValueObjectDynamicValue::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectDynamicValue::CalculateNumChildren(uint64_t max) {
const bool success = UpdateValueIfNeeded(false);
if (success && m_dynamic_type_info.HasType()) {
ExecutionContext exe_ctx(GetExecutionContextRef());
diff --git a/lldb/source/Core/ValueObjectMemory.cpp
b/lldb/source/Core/ValueObjectMemory.cpp
index 3f125a7bee8c77..768abb571c404f 100644
--- a/lldb/source/Core/ValueObjectMemory.cpp
+++ b/lldb/source/Core/ValueObjectMemory.cpp
@@ -126,7 +126,7 @@ ConstString ValueObjectMemory::GetDisplayTypeName() {
return m_compiler_type.GetDisplayTypeName();
}
-size_t ValueObjectMemory::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectMemory::CalculateNumChildren(uint64_t max) {
if (m_type_sp) {
auto child_count = m_type_sp->GetNumChildren(true);
return child_count <= max ? child_count : max;
diff --git a/lldb/source/Core/ValueObjectRegister.cpp
b/lldb/source/Core/ValueObjectRegister.cpp
index c2b84c11347359..9531e1a9242262 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -74,7 +74,7 @@ ConstString ValueObjectRegisterSet::GetQualifiedTypeName() {
return ConstString();
}
-size_t ValueObjectRegisterSet::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectRegisterSet::CalculateNumChildren(uint64_t max) {
const RegisterSet *reg_set = m_reg_ctx_sp->GetRegisterSet(m_reg_set_idx);
if (reg_set) {
auto reg_count = reg_set->num_registers;
@@ -220,7 +220,7 @@ ConstString ValueObjectRegister::GetTypeName() {
return m_type_name;
}
-size_t ValueObjectRegister::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectRegister::CalculateNumChildren(uint64_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index e8b4b02d11a0bb..e7e4c17b706705 100644
--- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -84,7 +84,7 @@ ConstString ValueObjectSynthetic::GetDisplayTypeName() {
return m_parent->GetDisplayTypeName();
}
-size_t ValueObjectSynthetic::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectSynthetic::CalculateNumChildren(uint64_t max) {
Log *log = GetLog(LLDBLog::DataFormatters);
UpdateValueIfNeeded();
diff --git a/lldb/source/Core/ValueObjectVTable.cpp
b/lldb/source/Core/ValueObjectVTable.cpp
index 177ae4167a1d45..d1baf7a9f7b12f 100644
--- a/lldb/source/Core/ValueObjectVTable.cpp
+++ b/lldb/source/Core/ValueObjectVTable.cpp
@@ -33,7 +33,7 @@ class ValueObjectVTableChild : public ValueObject {
std::optional<uint64_t> GetByteSize() override { return m_addr_size; };
- size_t CalculateNumChildren(uint32_t max) override { return 0; };
+ uint64_t CalculateNumChildren(uint64_t max) override { return 0; };
ValueType GetValueType() const override { return eValueTypeVTableEntry; };
@@ -159,7 +159,7 @@ std::optional<uint64_t> ValueObjectVTable::GetByteSize() {
return std::nullopt;
}
-size_t ValueObjectVTable::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectVTable::CalculateNumChildren(uint64_t max) {
if (UpdateValueIfNeeded(false))
return m_num_vtable_entries <= max ? m_num_vtable_entries : max;
return 0;
diff --git a/lldb/source/Core/ValueObjectVariable.cpp
b/lldb/source/Core/ValueObjectVariable.cpp
index 9f8df847f28a8e..400691a006506c 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -94,7 +94,7 @@ ConstString ValueObjectVariable::GetQualifiedTypeName() {
return ConstString();
}
-size_t ValueObjectVariable::CalculateNumChildren(uint32_t max) {
+uint64_t ValueObjectVariable::CalculateNumChildren(uint64_t max) {
CompilerType type(GetCompilerType());
if (!type.IsValid())
>From e9c706f3b0ad1a478d6c02d7cc01930bfdc35a77 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <apra...@apple.com>
Date: Mon, 4 Mar 2024 16:11:31 -0800
Subject: [PATCH 2/3] Change the return type of
SyntheticFrontend::CalculateNumChildren to int64_t
This is to enforce consistency across all APIs.
---
.../lldb/DataFormatters/TypeSynthetic.h | 12 +++++-----
.../lldb/DataFormatters/VectorIterator.h | 2 +-
.../Core/ValueObjectSyntheticFilter.cpp | 2 +-
lldb/source/DataFormatters/TypeSynthetic.cpp | 4 ++--
lldb/source/DataFormatters/VectorType.cpp | 2 +-
.../Language/CPlusPlus/BlockPointer.cpp | 2 +-
.../Plugins/Language/CPlusPlus/Coroutines.cpp | 2 +-
.../Plugins/Language/CPlusPlus/Coroutines.h | 2 +-
.../Language/CPlusPlus/GenericBitset.cpp | 2 +-
.../Language/CPlusPlus/GenericOptional.cpp | 2 +-
.../Plugins/Language/CPlusPlus/LibCxx.cpp | 8 +++----
.../Plugins/Language/CPlusPlus/LibCxx.h | 8 +++----
.../Language/CPlusPlus/LibCxxAtomic.cpp | 4 ++--
.../CPlusPlus/LibCxxInitializerList.cpp | 4 ++--
.../Plugins/Language/CPlusPlus/LibCxxList.cpp | 8 +++----
.../Plugins/Language/CPlusPlus/LibCxxMap.cpp | 4 ++--
.../Language/CPlusPlus/LibCxxQueue.cpp | 2 +-
.../CPlusPlus/LibCxxRangesRefView.cpp | 2 +-
.../Plugins/Language/CPlusPlus/LibCxxSpan.cpp | 4 ++--
.../Language/CPlusPlus/LibCxxTuple.cpp | 2 +-
.../Language/CPlusPlus/LibCxxUnorderedMap.cpp | 4 ++--
.../Language/CPlusPlus/LibCxxValarray.cpp | 4 ++--
.../Language/CPlusPlus/LibCxxVariant.cpp | 2 +-
.../Language/CPlusPlus/LibCxxVector.cpp | 8 +++----
.../Plugins/Language/CPlusPlus/LibStdcpp.cpp | 10 ++++----
.../Language/CPlusPlus/LibStdcppTuple.cpp | 4 ++--
.../CPlusPlus/LibStdcppUniquePointer.cpp | 4 ++--
lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 2 +-
lldb/source/Plugins/Language/ObjC/NSArray.cpp | 18 +++++++-------
.../Plugins/Language/ObjC/NSDictionary.cpp | 24 +++++++++----------
lldb/source/Plugins/Language/ObjC/NSError.cpp | 2 +-
.../Plugins/Language/ObjC/NSException.cpp | 2 +-
.../Plugins/Language/ObjC/NSIndexPath.cpp | 2 +-
lldb/source/Plugins/Language/ObjC/NSSet.cpp | 14 +++++------
34 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
index 23cc054b399a67..ba3b817079ba18 100644
--- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
@@ -38,9 +38,9 @@ class SyntheticChildrenFrontEnd {
virtual ~SyntheticChildrenFrontEnd() = default;
- virtual size_t CalculateNumChildren() = 0;
+ virtual uint64_t CalculateNumChildren() = 0;
- virtual size_t CalculateNumChildren(uint32_t max) {
+ virtual uint64_t CalculateNumChildren(uint64_t max) {
auto count = CalculateNumChildren();
return count <= max ? count : max;
}
@@ -109,7 +109,7 @@ class SyntheticValueProviderFrontEnd : public
SyntheticChildrenFrontEnd {
~SyntheticValueProviderFrontEnd() override = default;
- size_t CalculateNumChildren() override { return 0; }
+ uint64_t CalculateNumChildren() override { return 0; }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override { return nullptr; }
@@ -322,7 +322,7 @@ class TypeFilterImpl : public SyntheticChildren {
~FrontEnd() override = default;
- size_t CalculateNumChildren() override { return filter->GetCount(); }
+ uint64_t CalculateNumChildren() override { return filter->GetCount(); }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
if (idx >= filter->GetCount())
@@ -426,9 +426,9 @@ class ScriptedSyntheticChildren : public SyntheticChildren {
bool IsValid();
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
- size_t CalculateNumChildren(uint32_t max) override;
+ uint64_t CalculateNumChildren(uint64_t max) override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
diff --git a/lldb/include/lldb/DataFormatters/VectorIterator.h
b/lldb/include/lldb/DataFormatters/VectorIterator.h
index 5f774bb72c3a3a..4aea47d424c24b 100644
--- a/lldb/include/lldb/DataFormatters/VectorIterator.h
+++ b/lldb/include/lldb/DataFormatters/VectorIterator.h
@@ -24,7 +24,7 @@ class VectorIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
VectorIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp,
llvm::ArrayRef<ConstString> item_names);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index e7e4c17b706705..ad63dcbdfd6b50 100644
--- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -31,7 +31,7 @@ class DummySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
DummySyntheticFrontEnd(ValueObject &backend)
: SyntheticChildrenFrontEnd(backend) {}
- size_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }
+ uint64_t CalculateNumChildren() override { return
m_backend.GetNumChildren(); }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
return m_backend.GetChildAtIndex(idx);
diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp
b/lldb/source/DataFormatters/TypeSynthetic.cpp
index 8a6f132a39577a..cb662ca9edbed8 100644
--- a/lldb/source/DataFormatters/TypeSynthetic.cpp
+++ b/lldb/source/DataFormatters/TypeSynthetic.cpp
@@ -178,13 +178,13 @@ bool ScriptedSyntheticChildren::FrontEnd::IsValid() {
return (m_wrapper_sp && m_wrapper_sp->IsValid() && m_interpreter);
}
-size_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren() {
+uint64_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren() {
if (!m_wrapper_sp || m_interpreter == nullptr)
return 0;
return m_interpreter->CalculateNumChildren(m_wrapper_sp, UINT32_MAX);
}
-size_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren(uint32_t max)
{
+uint64_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren(uint64_t
max) {
if (!m_wrapper_sp || m_interpreter == nullptr)
return 0;
return m_interpreter->CalculateNumChildren(m_wrapper_sp, max);
diff --git a/lldb/source/DataFormatters/VectorType.cpp
b/lldb/source/DataFormatters/VectorType.cpp
index c94ca68319ee2c..f46385faf96fd5 100644
--- a/lldb/source/DataFormatters/VectorType.cpp
+++ b/lldb/source/DataFormatters/VectorType.cpp
@@ -224,7 +224,7 @@ class VectorTypeSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~VectorTypeSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override { return m_num_children; }
+ uint64_t CalculateNumChildren() override { return m_num_children; }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
if (idx >= CalculateNumChildren())
diff --git a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
index 2e43aa3fa1d8bf..321e85f2f92551 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
@@ -74,7 +74,7 @@ class BlockPointerSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~BlockPointerSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override {
+ uint64_t CalculateNumChildren() override {
const bool omit_empty_base_classes = false;
return m_block_struct_type.GetNumChildren(omit_empty_base_classes,
nullptr);
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
index 742017438bcf4a..da07b48734775e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
@@ -104,7 +104,7 @@
lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
~StdlibCoroutineHandleSyntheticFrontEnd() = default;
-size_t lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
+uint64_t lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
CalculateNumChildren() {
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
return 0;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
index d38c7ecefa6e13..f8e40eb3ad9417 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
@@ -34,7 +34,7 @@ class StdlibCoroutineHandleSyntheticFrontEnd
~StdlibCoroutineHandleSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
index ac316638523584..183e5a39f37180 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
@@ -34,7 +34,7 @@ class GenericBitsetFrontEnd : public
SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
- size_t CalculateNumChildren() override { return m_elements.size(); }
+ uint64_t CalculateNumChildren() override { return m_elements.size(); }
ValueObjectSP GetChildAtIndex(size_t idx) override;
private:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
index 57331eaa986890..59035c4dc0346e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
@@ -41,7 +41,7 @@ class GenericOptionalFrontend : public
SyntheticChildrenFrontEnd {
}
bool MightHaveChildren() override { return true; }
- size_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
+ uint64_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
ValueObjectSP GetChildAtIndex(size_t idx) override;
lldb::ChildCacheState Update() override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
index 7893aa7cc1f9df..aac490515c8b1e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -351,7 +351,7 @@
lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-size_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
CalculateNumChildren() {
return 2;
}
@@ -509,7 +509,7 @@ lldb::ChildCacheState lldb_private::formatters::
return lldb::ChildCacheState::eRefetch;
}
-size_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
+uint64_t
lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
CalculateNumChildren() {
return 2;
}
@@ -566,7 +566,7 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
Update();
}
-size_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
CalculateNumChildren() {
return (m_cntrl ? 1 : 0);
}
@@ -661,7 +661,7 @@
lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEndCreator(
: nullptr);
}
-size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
CalculateNumChildren() {
if (m_value_ptr_sp)
return m_deleter_sp ? 2 : 1;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
index d823fbd76222db..9b4d6ef623a510 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
@@ -87,7 +87,7 @@ class LibCxxMapIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
LibCxxMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -135,7 +135,7 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd
~LibCxxUnorderedMapIteratorSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -166,7 +166,7 @@ class LibcxxSharedPtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
LibcxxSharedPtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -186,7 +186,7 @@ class LibcxxUniquePtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
LibcxxUniquePtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
index c81b1e8012f6a9..afd07035817dc9 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
@@ -90,7 +90,7 @@ class LibcxxStdAtomicSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~LibcxxStdAtomicSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -124,7 +124,7 @@ bool
lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
return true;
}
-size_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
CalculateNumChildren() {
return m_real_child ? 1 : 0;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
index 3c33f94f923734..86145b1c3ef961 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
@@ -26,7 +26,7 @@ class LibcxxInitializerListSyntheticFrontEnd
~LibcxxInitializerListSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -59,7 +59,7 @@
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
// delete m_start;
}
-size_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
CalculateNumChildren() {
m_num_elements = 0;
ValueObjectSP size_sp(m_backend.GetChildMemberWithName("__size_"));
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
index e28ef818b10faf..2b0c7e88a36eca 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
@@ -136,7 +136,7 @@ class ForwardListFrontEnd : public AbstractListFrontEnd {
public:
ForwardListFrontEnd(ValueObject &valobj);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
ValueObjectSP GetChildAtIndex(size_t idx) override;
lldb::ChildCacheState Update() override;
};
@@ -147,7 +147,7 @@ class ListFrontEnd : public AbstractListFrontEnd {
~ListFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -240,7 +240,7 @@ ForwardListFrontEnd::ForwardListFrontEnd(ValueObject
&valobj)
Update();
}
-size_t ForwardListFrontEnd::CalculateNumChildren() {
+uint64_t ForwardListFrontEnd::CalculateNumChildren() {
if (m_count != UINT32_MAX)
return m_count;
@@ -308,7 +308,7 @@ ListFrontEnd::ListFrontEnd(lldb::ValueObjectSP valobj_sp)
Update();
}
-size_t ListFrontEnd::CalculateNumChildren() {
+uint64_t ListFrontEnd::CalculateNumChildren() {
if (m_count != UINT32_MAX)
return m_count;
if (!m_head || !m_tail || m_node_address == 0)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
index d208acfc9da47e..c901d3c9b3c442 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
@@ -177,7 +177,7 @@ class LibcxxStdMapSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~LibcxxStdMapSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -209,7 +209,7 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
Update();
}
-size_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
CalculateNumChildren() {
if (m_count != UINT32_MAX)
return m_count;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
index 83f93b16fc9a2d..cc14f9a5aaa90a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
@@ -28,7 +28,7 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
- size_t CalculateNumChildren() override {
+ uint64_t CalculateNumChildren() override {
return m_container_sp ? m_container_sp->GetNumChildren() : 0;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
index c032d67c66cb47..3cc458d6fd6868 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
@@ -27,7 +27,7 @@ class LibcxxStdRangesRefViewSyntheticFrontEnd
~LibcxxStdRangesRefViewSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override {
+ uint64_t CalculateNumChildren() override {
// __range_ will be the sole child of this type
return 1;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
index 4ddfaef9c0ad54..1060af2110e99a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
@@ -27,7 +27,7 @@ class LibcxxStdSpanSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~LibcxxStdSpanSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -73,7 +73,7 @@ lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
Update();
}
-size_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
CalculateNumChildren() {
return m_num_elements;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
index 546871012d2b38..7172f67fc45248 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
@@ -26,7 +26,7 @@ class TupleFrontEnd: public SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
- size_t CalculateNumChildren() override { return m_elements.size(); }
+ uint64_t CalculateNumChildren() override { return m_elements.size(); }
ValueObjectSP GetChildAtIndex(size_t idx) override;
private:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
index 4cac52f235a19a..897f8d1e667559 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -33,7 +33,7 @@ class LibcxxStdUnorderedMapSyntheticFrontEnd
~LibcxxStdUnorderedMapSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -62,7 +62,7 @@
lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
Update();
}
-size_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
CalculateNumChildren() {
return m_num_elements;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
index 7c8fd25fd9f281..93354ea95b7524 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
@@ -24,7 +24,7 @@ class LibcxxStdValarraySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~LibcxxStdValarraySyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -63,7 +63,7 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
// delete m_finish;
}
-size_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
CalculateNumChildren() {
if (!m_start || !m_finish)
return 0;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
index ecbb7cf0ca2b46..3b8051d937b3dd 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
@@ -205,7 +205,7 @@ class VariantFrontEnd : public SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
- size_t CalculateNumChildren() override { return m_size; }
+ uint64_t CalculateNumChildren() override { return m_size; }
ValueObjectSP GetChildAtIndex(size_t idx) override;
private:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
index 0c3c3f02b60c7b..469a1cdbc9d5b3 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
@@ -25,7 +25,7 @@ class LibcxxStdVectorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~LibcxxStdVectorSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -46,7 +46,7 @@ class LibcxxVectorBoolSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
LibcxxVectorBoolSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -82,7 +82,7 @@ lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
// delete m_finish;
}
-size_t lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
CalculateNumChildren() {
if (!m_start || !m_finish)
return 0;
@@ -165,7 +165,7 @@
lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
}
}
-size_t lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
+uint64_t lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
CalculateNumChildren() {
return m_count;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
index 411551839e1e61..955eb3448f9584 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
@@ -43,7 +43,7 @@ class LibstdcppMapIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
explicit LibstdcppMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP
valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -64,7 +64,7 @@ class LibStdcppSharedPtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
explicit LibStdcppSharedPtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -132,7 +132,7 @@ lldb::ChildCacheState
LibstdcppMapIteratorSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eReuse;
}
-size_t LibstdcppMapIteratorSyntheticFrontEnd::CalculateNumChildren() {
+uint64_t LibstdcppMapIteratorSyntheticFrontEnd::CalculateNumChildren() {
return 2;
}
@@ -219,7 +219,7 @@ lldb::ChildCacheState
VectorIteratorSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-size_t VectorIteratorSyntheticFrontEnd::CalculateNumChildren() { return 1; }
+uint64_t VectorIteratorSyntheticFrontEnd::CalculateNumChildren() { return 1; }
lldb::ValueObjectSP
VectorIteratorSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
@@ -371,7 +371,7 @@
LibStdcppSharedPtrSyntheticFrontEnd::LibStdcppSharedPtrSyntheticFrontEnd(
Update();
}
-size_t LibStdcppSharedPtrSyntheticFrontEnd::CalculateNumChildren() { return 1;
}
+uint64_t LibStdcppSharedPtrSyntheticFrontEnd::CalculateNumChildren() { return
1; }
lldb::ValueObjectSP
LibStdcppSharedPtrSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
index 189f9561e52a1b..e78fb75658674c 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
@@ -26,7 +26,7 @@ class LibStdcppTupleSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
explicit LibStdcppTupleSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -95,7 +95,7 @@ LibStdcppTupleSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
return lldb::ValueObjectSP();
}
-size_t LibStdcppTupleSyntheticFrontEnd::CalculateNumChildren() {
+uint64_t LibStdcppTupleSyntheticFrontEnd::CalculateNumChildren() {
return m_members.size();
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
index 3b0f6329d0e3ff..e45225019d21d0 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
@@ -26,7 +26,7 @@ class LibStdcppUniquePtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
explicit LibStdcppUniquePtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -135,7 +135,7 @@ LibStdcppUniquePtrSyntheticFrontEnd::GetChildAtIndex(size_t
idx) {
return lldb::ValueObjectSP();
}
-size_t LibStdcppUniquePtrSyntheticFrontEnd::CalculateNumChildren() {
+uint64_t LibStdcppUniquePtrSyntheticFrontEnd::CalculateNumChildren() {
if (m_del_obj)
return 2;
return 1;
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
index 64047dc53236bf..ac20f5d4034699 100644
--- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
+++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
@@ -1038,7 +1038,7 @@ class ObjCClassSyntheticChildrenFrontEnd : public
SyntheticChildrenFrontEnd {
~ObjCClassSyntheticChildrenFrontEnd() override = default;
- size_t CalculateNumChildren() override { return 0; }
+ uint64_t CalculateNumChildren() override { return 0; }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
index 09bf7a23d6097e..17edc0e6fcafe6 100644
--- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
@@ -50,7 +50,7 @@ class NSArrayMSyntheticFrontEndBase : public
SyntheticChildrenFrontEnd {
~NSArrayMSyntheticFrontEndBase() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -214,7 +214,7 @@ class GenericNSArrayISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~GenericNSArrayISyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -302,7 +302,7 @@ class NSArray0SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSArray0SyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -319,7 +319,7 @@ class NSArray1SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSArray1SyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -477,8 +477,8 @@ lldb_private::formatters::
: NSArrayMSyntheticFrontEndBase(valobj_sp), m_data_32(nullptr),
m_data_64(nullptr) {}
-size_t
-lldb_private::formatters::NSArrayMSyntheticFrontEndBase::CalculateNumChildren()
{
+uint64_t lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
+ CalculateNumChildren() {
return GetUsedCount();
}
@@ -634,7 +634,7 @@
lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
}
template <typename D32, typename D64, bool Inline>
-size_t
+uint64_t
lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
CalculateNumChildren() {
return m_data_32 ? m_data_32->used : m_data_64->used;
@@ -719,7 +719,7 @@
lldb_private::formatters::NSArray0SyntheticFrontEnd::GetIndexOfChildWithName(
return UINT32_MAX;
}
-size_t
+uint64_t
lldb_private::formatters::NSArray0SyntheticFrontEnd::CalculateNumChildren() {
return 0;
}
@@ -754,7 +754,7 @@
lldb_private::formatters::NSArray1SyntheticFrontEnd::GetIndexOfChildWithName(
return UINT32_MAX;
}
-size_t
+uint64_t
lldb_private::formatters::NSArray1SyntheticFrontEnd::CalculateNumChildren() {
return 1;
}
diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
index 9c252a98de8357..160f680e667743 100644
--- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
@@ -103,7 +103,7 @@ class NSDictionaryISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSDictionaryISyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -144,7 +144,7 @@ class NSConstantDictionarySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
NSConstantDictionarySyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -176,7 +176,7 @@ class NSCFDictionarySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
NSCFDictionarySyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -209,7 +209,7 @@ class NSDictionary1SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSDictionary1SyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -230,7 +230,7 @@ class GenericNSDictionaryMSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~GenericNSDictionaryMSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -263,7 +263,7 @@ namespace Foundation1100 {
~NSDictionaryMSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -606,7 +606,7 @@ size_t
lldb_private::formatters::NSDictionaryISyntheticFrontEnd::
return idx;
}
-size_t lldb_private::formatters::NSDictionaryISyntheticFrontEnd::
+uint64_t lldb_private::formatters::NSDictionaryISyntheticFrontEnd::
CalculateNumChildren() {
if (!m_data_32 && !m_data_64)
return 0;
@@ -744,7 +744,7 @@ size_t
lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::
return idx;
}
-size_t lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::
+uint64_t lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::
CalculateNumChildren() {
if (!m_hashtable.IsValid())
return 0;
@@ -880,7 +880,7 @@ size_t
lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
return idx;
}
-size_t lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
+uint64_t lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
CalculateNumChildren() {
return m_size;
}
@@ -994,7 +994,7 @@ size_t
lldb_private::formatters::NSDictionary1SyntheticFrontEnd::
return name == g_zero ? 0 : UINT32_MAX;
}
-size_t lldb_private::formatters::NSDictionary1SyntheticFrontEnd::
+uint64_t lldb_private::formatters::NSDictionary1SyntheticFrontEnd::
CalculateNumChildren() {
return 1;
}
@@ -1087,7 +1087,7 @@ size_t
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
}
template <typename D32, typename D64>
-size_t
+uint64_t
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,D64>::CalculateNumChildren()
{
if (!m_data_32 && !m_data_64)
return 0;
@@ -1250,7 +1250,7 @@ lldb_private::formatters::Foundation1100::
return idx;
}
-size_t
+uint64_t
lldb_private::formatters::Foundation1100::
NSDictionaryMSyntheticFrontEnd::CalculateNumChildren() {
if (!m_data_32 && !m_data_64)
diff --git a/lldb/source/Plugins/Language/ObjC/NSError.cpp
b/lldb/source/Plugins/Language/ObjC/NSError.cpp
index ce52ae542a50cb..f551328f3a62d0 100644
--- a/lldb/source/Plugins/Language/ObjC/NSError.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSError.cpp
@@ -116,7 +116,7 @@ class NSErrorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
// no need to delete m_child_ptr - it's kept alive by the cluster manager on
// our behalf
- size_t CalculateNumChildren() override {
+ uint64_t CalculateNumChildren() override {
if (m_child_ptr)
return 1;
if (m_child_sp)
diff --git a/lldb/source/Plugins/Language/ObjC/NSException.cpp
b/lldb/source/Plugins/Language/ObjC/NSException.cpp
index e8011e5d2ca0be..31b3ea85e5384f 100644
--- a/lldb/source/Plugins/Language/ObjC/NSException.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSException.cpp
@@ -123,7 +123,7 @@ class NSExceptionSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSExceptionSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override {
+ uint64_t CalculateNumChildren() override {
return 4;
}
diff --git a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
index 69e6ab1055d8c6..421b4434b418b5 100644
--- a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
@@ -40,7 +40,7 @@ class NSIndexPathSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSIndexPathSyntheticFrontEnd() override = default;
- size_t CalculateNumChildren() override { return m_impl.GetNumIndexes(); }
+ uint64_t CalculateNumChildren() override { return m_impl.GetNumIndexes(); }
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
return m_impl.GetIndexAtIndex(idx, m_uint_star_type);
diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
index ede64852d9a879..b29df8c7437f4d 100644
--- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -46,7 +46,7 @@ class NSSetISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSSetISyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -84,7 +84,7 @@ class NSCFSetSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
public:
NSCFSetSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -117,7 +117,7 @@ class GenericNSSetMSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~GenericNSSetMSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -233,7 +233,7 @@ class NSSetCodeRunningSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
~NSSetCodeRunningSyntheticFrontEnd() override;
- size_t CalculateNumChildren() override;
+ uint64_t CalculateNumChildren() override;
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
@@ -419,7 +419,7 @@
lldb_private::formatters::NSSetISyntheticFrontEnd::GetIndexOfChildWithName(
return idx;
}
-size_t
+uint64_t
lldb_private::formatters::NSSetISyntheticFrontEnd::CalculateNumChildren() {
if (!m_data_32 && !m_data_64)
return 0;
@@ -555,7 +555,7 @@
lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetIndexOfChildWithName(
return idx;
}
-size_t
+uint64_t
lldb_private::formatters::NSCFSetSyntheticFrontEnd::CalculateNumChildren() {
if (!m_hashtable.IsValid())
return 0;
@@ -696,7 +696,7 @@ lldb_private::formatters::
}
template <typename D32, typename D64>
-size_t
+uint64_t
lldb_private::formatters::
GenericNSSetMSyntheticFrontEnd<D32, D64>::CalculateNumChildren() {
if (!m_data_32 && !m_data_64)
>From bbf8e4bc002e73915026cc40fe0b6b626c095af7 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <apra...@apple.com>
Date: Mon, 4 Mar 2024 16:37:43 -0800
Subject: [PATCH 3/3] Change GetChildAtIndex to take a uint64_t
---
lldb/include/lldb/Core/ValueObject.h | 4 +-
.../lldb/Core/ValueObjectSyntheticFilter.h | 2 +-
.../lldb/DataFormatters/TypeSynthetic.h | 8 ++--
.../lldb/DataFormatters/VectorIterator.h | 2 +-
lldb/source/Core/ValueObject.cpp | 2 +-
.../Core/ValueObjectSyntheticFilter.cpp | 14 +++----
lldb/source/DataFormatters/TypeSynthetic.cpp | 2 +-
lldb/source/DataFormatters/VectorType.cpp | 2 +-
.../Language/CPlusPlus/BlockPointer.cpp | 2 +-
.../Plugins/Language/CPlusPlus/Coroutines.cpp | 2 +-
.../Plugins/Language/CPlusPlus/Coroutines.h | 2 +-
.../Language/CPlusPlus/GenericBitset.cpp | 4 +-
.../Language/CPlusPlus/GenericOptional.cpp | 4 +-
.../Plugins/Language/CPlusPlus/LibCxx.cpp | 8 ++--
.../Plugins/Language/CPlusPlus/LibCxx.h | 8 ++--
.../Language/CPlusPlus/LibCxxAtomic.cpp | 4 +-
.../CPlusPlus/LibCxxInitializerList.cpp | 4 +-
.../Plugins/Language/CPlusPlus/LibCxxList.cpp | 8 ++--
.../Plugins/Language/CPlusPlus/LibCxxMap.cpp | 4 +-
.../Language/CPlusPlus/LibCxxQueue.cpp | 2 +-
.../CPlusPlus/LibCxxRangesRefView.cpp | 2 +-
.../Plugins/Language/CPlusPlus/LibCxxSpan.cpp | 4 +-
.../Language/CPlusPlus/LibCxxTuple.cpp | 4 +-
.../Language/CPlusPlus/LibCxxUnorderedMap.cpp | 4 +-
.../Language/CPlusPlus/LibCxxValarray.cpp | 4 +-
.../Language/CPlusPlus/LibCxxVariant.cpp | 4 +-
.../Language/CPlusPlus/LibCxxVector.cpp | 8 ++--
.../Plugins/Language/CPlusPlus/LibStdcpp.cpp | 10 ++---
.../Language/CPlusPlus/LibStdcppTuple.cpp | 4 +-
.../CPlusPlus/LibStdcppUniquePointer.cpp | 4 +-
lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 2 +-
lldb/source/Plugins/Language/ObjC/NSArray.cpp | 19 +++++-----
.../Plugins/Language/ObjC/NSDictionary.cpp | 38 +++++++++----------
lldb/source/Plugins/Language/ObjC/NSError.cpp | 2 +-
.../Plugins/Language/ObjC/NSException.cpp | 2 +-
.../Plugins/Language/ObjC/NSIndexPath.cpp | 2 +-
lldb/source/Plugins/Language/ObjC/NSSet.cpp | 21 +++++-----
37 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/lldb/include/lldb/Core/ValueObject.h
b/lldb/include/lldb/Core/ValueObject.h
index 5f0b0265d87e8d..2bc5e7c372bcac 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -465,7 +465,7 @@ class ValueObject {
/// Returns a unique id for this ValueObject.
lldb::user_id_t GetID() const { return m_id.GetID(); }
- virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx,
+ virtual lldb::ValueObjectSP GetChildAtIndex(uint64_t idx,
bool can_create = true);
// The method always creates missing children in the path, if necessary.
@@ -791,7 +791,7 @@ class ValueObject {
return (m_children.find(idx) != m_children.end());
}
- ValueObject *GetChildAtIndex(size_t idx) {
+ ValueObject *GetChildAtIndex(uint64_t idx) {
std::lock_guard<std::recursive_mutex> guard(m_mutex);
const auto iter = m_children.find(idx);
return ((iter == m_children.end()) ? nullptr : iter->second);
diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
index e0b7c11d3a6aa7..4091242e8fc178 100644
--- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
@@ -51,7 +51,7 @@ class ValueObjectSynthetic : public ValueObject {
lldb::ValueType GetValueType() const override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx,
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx,
bool can_create = true) override;
lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name,
diff --git a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
index ba3b817079ba18..c9c907c2f78f62 100644
--- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
@@ -45,7 +45,7 @@ class SyntheticChildrenFrontEnd {
return count <= max ? count : max;
}
- virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx) = 0;
+ virtual lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) = 0;
virtual size_t GetIndexOfChildWithName(ConstString name) = 0;
@@ -111,7 +111,7 @@ class SyntheticValueProviderFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override { return 0; }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override { return nullptr; }
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override { return nullptr;
}
size_t GetIndexOfChildWithName(ConstString name) override {
return UINT32_MAX;
@@ -324,7 +324,7 @@ class TypeFilterImpl : public SyntheticChildren {
uint64_t CalculateNumChildren() override { return filter->GetCount(); }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
if (idx >= filter->GetCount())
return lldb::ValueObjectSP();
return m_backend.GetSyntheticExpressionPathChild(
@@ -430,7 +430,7 @@ class ScriptedSyntheticChildren : public SyntheticChildren {
uint64_t CalculateNumChildren(uint64_t max) override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
diff --git a/lldb/include/lldb/DataFormatters/VectorIterator.h
b/lldb/include/lldb/DataFormatters/VectorIterator.h
index 4aea47d424c24b..772fd6c95f1f2e 100644
--- a/lldb/include/lldb/DataFormatters/VectorIterator.h
+++ b/lldb/include/lldb/DataFormatters/VectorIterator.h
@@ -26,7 +26,7 @@ class VectorIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 840b100c70ddaa..114ab737672836 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -372,7 +372,7 @@ bool ValueObject::IsLogicalTrue(Status &error) {
return ret;
}
-ValueObjectSP ValueObject::GetChildAtIndex(size_t idx, bool can_create) {
+ValueObjectSP ValueObject::GetChildAtIndex(uint64_t idx, bool can_create) {
ValueObjectSP child_sp;
// We may need to update our value if we are dynamic
if (IsPossibleDynamicType())
diff --git a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index ad63dcbdfd6b50..c750692cc26da7 100644
--- a/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -33,7 +33,7 @@ class DummySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override { return
m_backend.GetNumChildren(); }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
return m_backend.GetChildAtIndex(idx);
}
@@ -236,13 +236,13 @@ bool ValueObjectSynthetic::UpdateValue() {
return true;
}
-lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
+lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(uint64_t idx,
bool can_create) {
Log *log = GetLog(LLDBLog::DataFormatters);
LLDB_LOGF(log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, retrieving "
- "child at index %zu",
+ "child at index %llu",
GetName().AsCString(), idx);
UpdateValueIfNeeded();
@@ -261,7 +261,7 @@ lldb::ValueObjectSP
ValueObjectSynthetic::GetChildAtIndex(size_t idx,
if (can_create && m_synth_filter_up != nullptr) {
LLDB_LOGF(log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
- "index %zu not cached and will be created",
+ "index %llu not cached and will be created",
GetName().AsCString(), idx);
lldb::ValueObjectSP synth_guy = m_synth_filter_up->GetChildAtIndex(idx);
@@ -269,7 +269,7 @@ lldb::ValueObjectSP
ValueObjectSynthetic::GetChildAtIndex(size_t idx,
LLDB_LOGF(
log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at index "
- "%zu created as %p (is "
+ "%llu created as %p (is "
"synthetic: %s)",
GetName().AsCString(), idx, static_cast<void *>(synth_guy.get()),
synth_guy.get()
@@ -291,7 +291,7 @@ lldb::ValueObjectSP
ValueObjectSynthetic::GetChildAtIndex(size_t idx,
} else {
LLDB_LOGF(log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
- "index %zu not cached and cannot "
+ "index %llu not cached and cannot "
"be created (can_create = %s, synth_filter = %p)",
GetName().AsCString(), idx, can_create ? "yes" : "no",
static_cast<void *>(m_synth_filter_up.get()));
@@ -301,7 +301,7 @@ lldb::ValueObjectSP
ValueObjectSynthetic::GetChildAtIndex(size_t idx,
} else {
LLDB_LOGF(log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
- "index %zu cached as %p",
+ "index %llu cached as %p",
GetName().AsCString(), idx, static_cast<void *>(valobj));
return valobj->GetSP();
diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp
b/lldb/source/DataFormatters/TypeSynthetic.cpp
index cb662ca9edbed8..b7bde294aaeaf4 100644
--- a/lldb/source/DataFormatters/TypeSynthetic.cpp
+++ b/lldb/source/DataFormatters/TypeSynthetic.cpp
@@ -167,7 +167,7 @@ ScriptedSyntheticChildren::FrontEnd::FrontEnd(std::string
pclass,
ScriptedSyntheticChildren::FrontEnd::~FrontEnd() = default;
lldb::ValueObjectSP
-ScriptedSyntheticChildren::FrontEnd::GetChildAtIndex(size_t idx) {
+ScriptedSyntheticChildren::FrontEnd::GetChildAtIndex(uint64_t idx) {
if (!m_wrapper_sp || !m_interpreter)
return lldb::ValueObjectSP();
diff --git a/lldb/source/DataFormatters/VectorType.cpp
b/lldb/source/DataFormatters/VectorType.cpp
index f46385faf96fd5..815488532c2208 100644
--- a/lldb/source/DataFormatters/VectorType.cpp
+++ b/lldb/source/DataFormatters/VectorType.cpp
@@ -226,7 +226,7 @@ class VectorTypeSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override { return m_num_children; }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
if (idx >= CalculateNumChildren())
return {};
std::optional<uint64_t> size = m_child_type.GetByteSize(nullptr);
diff --git a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
index 321e85f2f92551..12c094eee68c75 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
@@ -79,7 +79,7 @@ class BlockPointerSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
return m_block_struct_type.GetNumChildren(omit_empty_base_classes,
nullptr);
}
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
if (!m_block_struct_type.IsValid()) {
return lldb::ValueObjectSP();
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
index da07b48734775e..3a48cf916ea1eb 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
@@ -113,7 +113,7 @@ uint64_t
lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
}
lldb::ValueObjectSP lldb_private::formatters::
- StdlibCoroutineHandleSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+ StdlibCoroutineHandleSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
switch (idx) {
case 0:
return m_resume_ptr_sp;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
index f8e40eb3ad9417..2387456cdf416d 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
@@ -36,7 +36,7 @@ class StdlibCoroutineHandleSyntheticFrontEnd
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
index 183e5a39f37180..f1e50005825519 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
@@ -35,7 +35,7 @@ class GenericBitsetFrontEnd : public
SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
uint64_t CalculateNumChildren() override { return m_elements.size(); }
- ValueObjectSP GetChildAtIndex(size_t idx) override;
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override;
private:
llvm::StringRef GetDataContainerMemberName();
@@ -97,7 +97,7 @@ lldb::ChildCacheState GenericBitsetFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-ValueObjectSP GenericBitsetFrontEnd::GetChildAtIndex(size_t idx) {
+ValueObjectSP GenericBitsetFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx >= m_elements.size() || !m_first)
return ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
index 59035c4dc0346e..c203878755aef7 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
@@ -43,7 +43,7 @@ class GenericOptionalFrontend : public
SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
uint64_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
- ValueObjectSP GetChildAtIndex(size_t idx) override;
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
private:
@@ -81,7 +81,7 @@ lldb::ChildCacheState GenericOptionalFrontend::Update() {
return lldb::ChildCacheState::eRefetch;
}
-ValueObjectSP GenericOptionalFrontend::GetChildAtIndex(size_t _idx) {
+ValueObjectSP GenericOptionalFrontend::GetChildAtIndex(uint64_t _idx) {
if (!m_has_value)
return ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
index aac490515c8b1e..5e036da9b795eb 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -358,7 +358,7 @@ uint64_t
lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (m_pair_ptr)
return m_pair_ptr->GetChildAtIndex(idx);
if (m_pair_sp)
@@ -515,7 +515,7 @@ uint64_t
lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
}
lldb::ValueObjectSP lldb_private::formatters::
- LibCxxUnorderedMapIteratorSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+ LibCxxUnorderedMapIteratorSyntheticFrontEnd::GetChildAtIndex(uint64_t idx)
{
if (m_pair_sp)
return m_pair_sp->GetChildAtIndex(idx);
return lldb::ValueObjectSP();
@@ -573,7 +573,7 @@ uint64_t
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (!m_cntrl)
return lldb::ValueObjectSP();
@@ -670,7 +670,7 @@ uint64_t
lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (!m_value_ptr_sp)
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
index 9b4d6ef623a510..4f6890c0717454 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
@@ -89,7 +89,7 @@ class LibCxxMapIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -137,7 +137,7 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -168,7 +168,7 @@ class LibcxxSharedPtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -188,7 +188,7 @@ class LibcxxUniquePtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
index afd07035817dc9..d882bb68d40c32 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
@@ -92,7 +92,7 @@ class LibcxxStdAtomicSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -131,7 +131,7 @@ uint64_t
lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (idx == 0)
return m_real_child->GetSP()->Clone(ConstString("Value"));
return nullptr;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
index 86145b1c3ef961..a49e721bf2c5d9 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
@@ -28,7 +28,7 @@ class LibcxxInitializerListSyntheticFrontEnd
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -69,7 +69,7 @@ uint64_t
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
}
lldb::ValueObjectSP lldb_private::formatters::
- LibcxxInitializerListSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+ LibcxxInitializerListSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (!m_start)
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
index 2b0c7e88a36eca..b3fa0b0d81ab01 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
@@ -137,7 +137,7 @@ class ForwardListFrontEnd : public AbstractListFrontEnd {
ForwardListFrontEnd(ValueObject &valobj);
uint64_t CalculateNumChildren() override;
- ValueObjectSP GetChildAtIndex(size_t idx) override;
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
};
@@ -149,7 +149,7 @@ class ListFrontEnd : public AbstractListFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -253,7 +253,7 @@ uint64_t ForwardListFrontEnd::CalculateNumChildren() {
return m_count;
}
-ValueObjectSP ForwardListFrontEnd::GetChildAtIndex(size_t idx) {
+ValueObjectSP ForwardListFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx >= CalculateNumChildren())
return nullptr;
@@ -343,7 +343,7 @@ uint64_t ListFrontEnd::CalculateNumChildren() {
}
}
-lldb::ValueObjectSP ListFrontEnd::GetChildAtIndex(size_t idx) {
+lldb::ValueObjectSP ListFrontEnd::GetChildAtIndex(uint64_t idx) {
static ConstString g_value("__value_");
static ConstString g_next("__next_");
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
index c901d3c9b3c442..af3cf772074c61 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
@@ -179,7 +179,7 @@ class LibcxxStdMapSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -308,7 +308,7 @@ void
lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetValueOffset(
lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
static ConstString g_cc_("__cc_"), g_cc("__cc");
static ConstString g_nc("__nc");
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
index cc14f9a5aaa90a..509a556dfa9e05 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
@@ -32,7 +32,7 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
return m_container_sp ? m_container_sp->GetNumChildren() : 0;
}
- ValueObjectSP GetChildAtIndex(size_t idx) override {
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override {
return m_container_sp ? m_container_sp->GetChildAtIndex(idx)
: nullptr;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
index 3cc458d6fd6868..740228c4b9887a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
@@ -32,7 +32,7 @@ class LibcxxStdRangesRefViewSyntheticFrontEnd
return 1;
}
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
// Since we only have a single child, return it
assert(idx == 0);
return m_range_sp;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
index 1060af2110e99a..e7d39ac8f96422 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
@@ -29,7 +29,7 @@ class LibcxxStdSpanSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
/// Determines properties of the std::span<> associated with this object
//
@@ -80,7 +80,7 @@ uint64_t
lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (!m_start)
return {};
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
index 7172f67fc45248..2e3fc3db4f4fd1 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
@@ -27,7 +27,7 @@ class TupleFrontEnd: public SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
uint64_t CalculateNumChildren() override { return m_elements.size(); }
- ValueObjectSP GetChildAtIndex(size_t idx) override;
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override;
private:
// The lifetime of a ValueObject and all its derivative ValueObjects
@@ -58,7 +58,7 @@ lldb::ChildCacheState TupleFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-ValueObjectSP TupleFrontEnd::GetChildAtIndex(size_t idx) {
+ValueObjectSP TupleFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx >= m_elements.size())
return ValueObjectSP();
if (!m_base)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
index 897f8d1e667559..ffeb123686846e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -35,7 +35,7 @@ class LibcxxStdUnorderedMapSyntheticFrontEnd
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -93,7 +93,7 @@ static bool isUnorderedMap(ConstString type_name) {
}
lldb::ValueObjectSP lldb_private::formatters::
- LibcxxStdUnorderedMapSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+ LibcxxStdUnorderedMapSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx >= CalculateNumChildren())
return lldb::ValueObjectSP();
if (m_tree == nullptr)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
index 93354ea95b7524..a58c1e5bb4b18c 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
@@ -26,7 +26,7 @@ class LibcxxStdValarraySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -84,7 +84,7 @@ uint64_t
lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (!m_start || !m_finish)
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
index 3b8051d937b3dd..167503ac99f00b 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
@@ -206,7 +206,7 @@ class VariantFrontEnd : public SyntheticChildrenFrontEnd {
bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
uint64_t CalculateNumChildren() override { return m_size; }
- ValueObjectSP GetChildAtIndex(size_t idx) override;
+ ValueObjectSP GetChildAtIndex(uint64_t idx) override;
private:
size_t m_size = 0;
@@ -233,7 +233,7 @@ lldb::ChildCacheState VariantFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-ValueObjectSP VariantFrontEnd::GetChildAtIndex(size_t idx) {
+ValueObjectSP VariantFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx >= m_size)
return {};
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
index 469a1cdbc9d5b3..a798d8630930ed 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
@@ -27,7 +27,7 @@ class LibcxxStdVectorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -48,7 +48,7 @@ class LibcxxVectorBoolSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -103,7 +103,7 @@ uint64_t
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (!m_start || !m_finish)
return lldb::ValueObjectSP();
@@ -172,7 +172,7 @@ uint64_t
lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
auto iter = m_children.find(idx), end = m_children.end();
if (iter != end)
return iter->second;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
index 955eb3448f9584..1d84e1ce45fd27 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
@@ -45,7 +45,7 @@ class LibstdcppMapIteratorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -66,7 +66,7 @@ class LibStdcppSharedPtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -137,7 +137,7 @@ uint64_t
LibstdcppMapIteratorSyntheticFrontEnd::CalculateNumChildren() {
}
lldb::ValueObjectSP
-LibstdcppMapIteratorSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+LibstdcppMapIteratorSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (m_pair_address != 0 && m_pair_type) {
if (!m_pair_sp)
m_pair_sp = CreateValueObjectFromAddress("pair", m_pair_address,
@@ -222,7 +222,7 @@ lldb::ChildCacheState
VectorIteratorSyntheticFrontEnd::Update() {
uint64_t VectorIteratorSyntheticFrontEnd::CalculateNumChildren() { return 1; }
lldb::ValueObjectSP
-VectorIteratorSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+VectorIteratorSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx == 0)
return m_item_sp;
return lldb::ValueObjectSP();
@@ -374,7 +374,7 @@
LibStdcppSharedPtrSyntheticFrontEnd::LibStdcppSharedPtrSyntheticFrontEnd(
uint64_t LibStdcppSharedPtrSyntheticFrontEnd::CalculateNumChildren() { return
1; }
lldb::ValueObjectSP
-LibStdcppSharedPtrSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+LibStdcppSharedPtrSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx == 0)
return m_ptr_obj->GetSP();
if (idx == 1) {
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
index e78fb75658674c..708849a0636d26 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
@@ -28,7 +28,7 @@ class LibStdcppTupleSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -89,7 +89,7 @@ lldb::ChildCacheState
LibStdcppTupleSyntheticFrontEnd::Update() {
bool LibStdcppTupleSyntheticFrontEnd::MightHaveChildren() { return true; }
lldb::ValueObjectSP
-LibStdcppTupleSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+LibStdcppTupleSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx < m_members.size() && m_members[idx])
return m_members[idx]->GetSP();
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
index e45225019d21d0..f1dfde309e7b3e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
@@ -28,7 +28,7 @@ class LibStdcppUniquePtrSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -116,7 +116,7 @@ lldb::ChildCacheState
LibStdcppUniquePtrSyntheticFrontEnd::Update() {
bool LibStdcppUniquePtrSyntheticFrontEnd::MightHaveChildren() { return true; }
lldb::ValueObjectSP
-LibStdcppUniquePtrSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+LibStdcppUniquePtrSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
if (idx == 0 && m_ptr_obj)
return m_ptr_obj->GetSP();
if (idx == 1 && m_del_obj)
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
index ac20f5d4034699..b5cc3d9ffcebc1 100644
--- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
+++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
@@ -1040,7 +1040,7 @@ class ObjCClassSyntheticChildrenFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override { return 0; }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
return lldb::ValueObjectSP();
}
diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
index 17edc0e6fcafe6..f707916d945461 100644
--- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
@@ -52,7 +52,7 @@ class NSArrayMSyntheticFrontEndBase : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override = 0;
@@ -216,7 +216,7 @@ class GenericNSArrayISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -304,7 +304,7 @@ class NSArray0SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -321,7 +321,7 @@ class NSArray1SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -484,7 +484,7 @@ uint64_t
lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
lldb::ValueObjectSP
lldb_private::formatters::NSArrayMSyntheticFrontEndBase::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (idx >= CalculateNumChildren())
return lldb::ValueObjectSP();
lldb::addr_t object_at_idx = GetDataAddress();
@@ -682,9 +682,8 @@
lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
}
template <typename D32, typename D64, bool Inline>
-lldb::ValueObjectSP
-lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
- GetChildAtIndex(size_t idx) {
+lldb::ValueObjectSP lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<
+ D32, D64, Inline>::GetChildAtIndex(uint64_t idx) {
if (idx >= CalculateNumChildren())
return lldb::ValueObjectSP();
lldb::addr_t object_at_idx;
@@ -735,7 +734,7 @@ bool
lldb_private::formatters::NSArray0SyntheticFrontEnd::MightHaveChildren() {
lldb::ValueObjectSP
lldb_private::formatters::NSArray0SyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
return lldb::ValueObjectSP();
}
@@ -770,7 +769,7 @@ bool
lldb_private::formatters::NSArray1SyntheticFrontEnd::MightHaveChildren() {
lldb::ValueObjectSP
lldb_private::formatters::NSArray1SyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
static const ConstString g_zero("[0]");
if (idx == 0) {
diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
index 160f680e667743..6b344901532e94 100644
--- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
@@ -105,7 +105,7 @@ class NSDictionaryISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -146,7 +146,7 @@ class NSConstantDictionarySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -178,7 +178,7 @@ class NSCFDictionarySyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -211,7 +211,7 @@ class NSDictionary1SyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -232,7 +232,7 @@ class GenericNSDictionaryMSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -265,7 +265,7 @@ namespace Foundation1100 {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -655,8 +655,8 @@ bool
lldb_private::formatters::NSDictionaryISyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::NSDictionaryISyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
- uint32_t num_children = CalculateNumChildren();
+ uint64_t idx) {
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -777,11 +777,11 @@ bool
lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
lldb::addr_t m_keys_ptr = m_hashtable.GetKeyPointer();
lldb::addr_t m_values_ptr = m_hashtable.GetValuePointer();
- const uint32_t num_children = CalculateNumChildren();
+ const uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -920,8 +920,8 @@ bool
lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
}
lldb::ValueObjectSP lldb_private::formatters::
- NSConstantDictionarySyntheticFrontEnd::GetChildAtIndex(size_t idx) {
- uint32_t num_children = CalculateNumChildren();
+ NSConstantDictionarySyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -1012,7 +1012,7 @@ bool
lldb_private::formatters::NSDictionary1SyntheticFrontEnd::
lldb::ValueObjectSP
lldb_private::formatters::NSDictionary1SyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
if (idx != 0)
return lldb::ValueObjectSP();
@@ -1087,8 +1087,8 @@ size_t
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
}
template <typename D32, typename D64>
-uint64_t
-lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,D64>::CalculateNumChildren()
{
+uint64_t lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
+ D32, D64>::CalculateNumChildren() {
if (!m_data_32 && !m_data_64)
return 0;
return (m_data_32 ? m_data_32->_used : m_data_64->_used);
@@ -1140,7 +1140,7 @@
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,D64>::
template <typename D32, typename D64>
lldb::ValueObjectSP
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
- D32, D64>::GetChildAtIndex(size_t idx) {
+ D32, D64>::GetChildAtIndex(uint64_t idx) {
lldb::addr_t m_keys_ptr;
lldb::addr_t m_values_ptr;
if (m_data_32) {
@@ -1153,7 +1153,7 @@
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
m_values_ptr = m_data_64->_buffer + (m_ptr_size * size);
}
- uint32_t num_children = CalculateNumChildren();
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -1300,13 +1300,13 @@ lldb_private::formatters::Foundation1100::
lldb::ValueObjectSP
lldb_private::formatters::Foundation1100::
- NSDictionaryMSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
+ NSDictionaryMSyntheticFrontEnd::GetChildAtIndex(uint64_t idx) {
lldb::addr_t m_keys_ptr =
(m_data_32 ? m_data_32->_keys_addr : m_data_64->_keys_addr);
lldb::addr_t m_values_ptr =
(m_data_32 ? m_data_32->_objs_addr : m_data_64->_objs_addr);
- uint32_t num_children = CalculateNumChildren();
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/ObjC/NSError.cpp
b/lldb/source/Plugins/Language/ObjC/NSError.cpp
index f551328f3a62d0..33f091be1c2d27 100644
--- a/lldb/source/Plugins/Language/ObjC/NSError.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSError.cpp
@@ -124,7 +124,7 @@ class NSErrorSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
return 0;
}
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
if (idx != 0)
return lldb::ValueObjectSP();
diff --git a/lldb/source/Plugins/Language/ObjC/NSException.cpp
b/lldb/source/Plugins/Language/ObjC/NSException.cpp
index 31b3ea85e5384f..aed65cd1661aef 100644
--- a/lldb/source/Plugins/Language/ObjC/NSException.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSException.cpp
@@ -127,7 +127,7 @@ class NSExceptionSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
return 4;
}
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
switch (idx) {
case 0: return m_name_sp;
case 1: return m_reason_sp;
diff --git a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
index 421b4434b418b5..a461113dfdd551 100644
--- a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
@@ -42,7 +42,7 @@ class NSIndexPathSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override { return m_impl.GetNumIndexes(); }
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override {
return m_impl.GetIndexAtIndex(idx, m_uint_star_type);
}
diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
index b29df8c7437f4d..80e4d286b9183a 100644
--- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -48,7 +48,7 @@ class NSSetISyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -86,7 +86,7 @@ class NSCFSetSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -119,7 +119,7 @@ class GenericNSSetMSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -235,7 +235,7 @@ class NSSetCodeRunningSyntheticFrontEnd : public
SyntheticChildrenFrontEnd {
uint64_t CalculateNumChildren() override;
- lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
+ lldb::ValueObjectSP GetChildAtIndex(uint64_t idx) override;
lldb::ChildCacheState Update() override;
@@ -466,8 +466,9 @@ bool
lldb_private::formatters::NSSetISyntheticFrontEnd::MightHaveChildren() {
}
lldb::ValueObjectSP
-lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex(size_t idx)
{
- uint32_t num_children = CalculateNumChildren();
+lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex(
+ uint64_t idx) {
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -587,10 +588,10 @@ bool
lldb_private::formatters::NSCFSetSyntheticFrontEnd::MightHaveChildren() {
lldb::ValueObjectSP
lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetChildAtIndex(
- size_t idx) {
+ uint64_t idx) {
lldb::addr_t m_values_ptr = m_hashtable.GetValuePointer();
- const uint32_t num_children = CalculateNumChildren();
+ const uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
@@ -748,11 +749,11 @@ lldb_private::formatters::
template <typename D32, typename D64>
lldb::ValueObjectSP
lldb_private::formatters::
- GenericNSSetMSyntheticFrontEnd<D32, D64>::GetChildAtIndex(size_t idx) {
+ GenericNSSetMSyntheticFrontEnd<D32, D64>::GetChildAtIndex(uint64_t idx) {
lldb::addr_t m_objs_addr =
(m_data_32 ? m_data_32->_objs_addr : m_data_64->_objs_addr);
- uint32_t num_children = CalculateNumChildren();
+ uint64_t num_children = CalculateNumChildren();
if (idx >= num_children)
return lldb::ValueObjectSP();
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
