Skip to content

Commit 54c955b

Browse files
committed
Change the return type of ValueObject::CalculateNumChildren to uint32_t.
In the end this value comes from TypeSystem::GetNumChildren which returns a uint32_t, so ValueObject should be consistent with that.
1 parent a6a6fca commit 54c955b

20 files changed

+23
-23
lines changed

lldb/include/lldb/Core/ValueObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ class ValueObject {
958958
int32_t synthetic_index);
959959

960960
/// Should only be called by ValueObject::GetNumChildren().
961-
virtual size_t CalculateNumChildren(uint32_t max = UINT32_MAX) = 0;
961+
virtual uint32_t CalculateNumChildren(uint32_t max = UINT32_MAX) = 0;
962962

963963
void SetNumChildren(size_t num_children);
964964

lldb/include/lldb/Core/ValueObjectCast.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ValueObjectCast : public ValueObject {
3333

3434
std::optional<uint64_t> GetByteSize() override;
3535

36-
size_t CalculateNumChildren(uint32_t max) override;
36+
uint32_t CalculateNumChildren(uint32_t max) override;
3737

3838
lldb::ValueType GetValueType() const override;
3939

lldb/include/lldb/Core/ValueObjectChild.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ValueObjectChild : public ValueObject {
3939

4040
lldb::ValueType GetValueType() const override;
4141

42-
size_t CalculateNumChildren(uint32_t max) override;
42+
uint32_t CalculateNumChildren(uint32_t max) override;
4343

4444
ConstString GetTypeName() override;
4545

lldb/include/lldb/Core/ValueObjectConstResult.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ValueObjectConstResult : public ValueObject {
6767

6868
lldb::ValueType GetValueType() const override;
6969

70-
size_t CalculateNumChildren(uint32_t max) override;
70+
uint32_t CalculateNumChildren(uint32_t max) override;
7171

7272
ConstString GetTypeName() override;
7373

lldb/include/lldb/Core/ValueObjectDynamicValue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ValueObjectDynamicValue : public ValueObject {
4343

4444
ConstString GetDisplayTypeName() override;
4545

46-
size_t CalculateNumChildren(uint32_t max) override;
46+
uint32_t CalculateNumChildren(uint32_t max) override;
4747

4848
lldb::ValueType GetValueType() const override;
4949

lldb/include/lldb/Core/ValueObjectMemory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ValueObjectMemory : public ValueObject {
4747

4848
ConstString GetDisplayTypeName() override;
4949

50-
size_t CalculateNumChildren(uint32_t max) override;
50+
uint32_t CalculateNumChildren(uint32_t max) override;
5151

5252
lldb::ValueType GetValueType() const override;
5353

lldb/include/lldb/Core/ValueObjectRegister.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ValueObjectRegisterSet : public ValueObject {
4747

4848
ConstString GetQualifiedTypeName() override;
4949

50-
size_t CalculateNumChildren(uint32_t max) override;
50+
uint32_t CalculateNumChildren(uint32_t max) override;
5151

5252
ValueObject *CreateChildAtIndex(size_t idx, bool synthetic_array_member,
5353
int32_t synthetic_index) override;
@@ -95,7 +95,7 @@ class ValueObjectRegister : public ValueObject {
9595

9696
ConstString GetTypeName() override;
9797

98-
size_t CalculateNumChildren(uint32_t max) override;
98+
uint32_t CalculateNumChildren(uint32_t max) override;
9999

100100
bool SetValueFromCString(const char *value_str, Status &error) override;
101101

lldb/include/lldb/Core/ValueObjectSyntheticFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ValueObjectSynthetic : public ValueObject {
4747

4848
bool MightHaveChildren() override;
4949

50-
size_t CalculateNumChildren(uint32_t max) override;
50+
uint32_t CalculateNumChildren(uint32_t max) override;
5151

5252
lldb::ValueType GetValueType() const override;
5353

lldb/include/lldb/Core/ValueObjectVTable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ValueObjectVTable : public ValueObject {
6464

6565
std::optional<uint64_t> GetByteSize() override;
6666

67-
size_t CalculateNumChildren(uint32_t max) override;
67+
uint32_t CalculateNumChildren(uint32_t max) override;
6868

6969
ValueObject *CreateChildAtIndex(size_t idx, bool synthetic_array_member,
7070
int32_t synthetic_index) override;

lldb/include/lldb/Core/ValueObjectVariable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ValueObjectVariable : public ValueObject {
4646

4747
ConstString GetDisplayTypeName() override;
4848

49-
size_t CalculateNumChildren(uint32_t max) override;
49+
uint32_t CalculateNumChildren(uint32_t max) override;
5050

5151
lldb::ValueType GetValueType() const override;
5252

lldb/include/lldb/Target/StackFrameRecognizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class ValueObjectRecognizerSynthesizedValue : public ValueObject {
164164
m_value = m_parent->GetValue();
165165
return true;
166166
}
167-
size_t CalculateNumChildren(uint32_t max = UINT32_MAX) override {
167+
uint32_t CalculateNumChildren(uint32_t max = UINT32_MAX) override {
168168
return m_parent->GetNumChildren(max);
169169
}
170170
CompilerType GetCompilerTypeImpl() override {

lldb/source/Core/ValueObjectCast.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ValueObjectCast::~ValueObjectCast() = default;
4141

4242
CompilerType ValueObjectCast::GetCompilerTypeImpl() { return m_cast_type; }
4343

44-
size_t ValueObjectCast::CalculateNumChildren(uint32_t max) {
44+
uint32_t ValueObjectCast::CalculateNumChildren(uint32_t max) {
4545
ExecutionContext exe_ctx(GetExecutionContextRef());
4646
auto children_count = GetCompilerType().GetNumChildren(
4747
true, &exe_ctx);

lldb/source/Core/ValueObjectChild.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ lldb::ValueType ValueObjectChild::GetValueType() const {
4949
return m_parent->GetValueType();
5050
}
5151

52-
size_t ValueObjectChild::CalculateNumChildren(uint32_t max) {
52+
uint32_t ValueObjectChild::CalculateNumChildren(uint32_t max) {
5353
ExecutionContext exe_ctx(GetExecutionContextRef());
5454
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
5555
return children_count <= max ? children_count : max;

lldb/source/Core/ValueObjectConstResult.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ std::optional<uint64_t> ValueObjectConstResult::GetByteSize() {
216216

217217
void ValueObjectConstResult::SetByteSize(size_t size) { m_byte_size = size; }
218218

219-
size_t ValueObjectConstResult::CalculateNumChildren(uint32_t max) {
219+
uint32_t ValueObjectConstResult::CalculateNumChildren(uint32_t max) {
220220
ExecutionContext exe_ctx(GetExecutionContextRef());
221221
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
222222
return children_count <= max ? children_count : max;

lldb/source/Core/ValueObjectDynamicValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ConstString ValueObjectDynamicValue::GetDisplayTypeName() {
8585
return m_parent->GetDisplayTypeName();
8686
}
8787

88-
size_t ValueObjectDynamicValue::CalculateNumChildren(uint32_t max) {
88+
uint32_t ValueObjectDynamicValue::CalculateNumChildren(uint32_t max) {
8989
const bool success = UpdateValueIfNeeded(false);
9090
if (success && m_dynamic_type_info.HasType()) {
9191
ExecutionContext exe_ctx(GetExecutionContextRef());

lldb/source/Core/ValueObjectMemory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ConstString ValueObjectMemory::GetDisplayTypeName() {
126126
return m_compiler_type.GetDisplayTypeName();
127127
}
128128

129-
size_t ValueObjectMemory::CalculateNumChildren(uint32_t max) {
129+
uint32_t ValueObjectMemory::CalculateNumChildren(uint32_t max) {
130130
if (m_type_sp) {
131131
auto child_count = m_type_sp->GetNumChildren(true);
132132
return child_count <= max ? child_count : max;

lldb/source/Core/ValueObjectRegister.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ConstString ValueObjectRegisterSet::GetQualifiedTypeName() {
7474
return ConstString();
7575
}
7676

77-
size_t ValueObjectRegisterSet::CalculateNumChildren(uint32_t max) {
77+
uint32_t ValueObjectRegisterSet::CalculateNumChildren(uint32_t max) {
7878
const RegisterSet *reg_set = m_reg_ctx_sp->GetRegisterSet(m_reg_set_idx);
7979
if (reg_set) {
8080
auto reg_count = reg_set->num_registers;
@@ -220,7 +220,7 @@ ConstString ValueObjectRegister::GetTypeName() {
220220
return m_type_name;
221221
}
222222

223-
size_t ValueObjectRegister::CalculateNumChildren(uint32_t max) {
223+
uint32_t ValueObjectRegister::CalculateNumChildren(uint32_t max) {
224224
ExecutionContext exe_ctx(GetExecutionContextRef());
225225
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
226226
return children_count <= max ? children_count : max;

lldb/source/Core/ValueObjectSyntheticFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ConstString ValueObjectSynthetic::GetDisplayTypeName() {
8484
return m_parent->GetDisplayTypeName();
8585
}
8686

87-
size_t ValueObjectSynthetic::CalculateNumChildren(uint32_t max) {
87+
uint32_t ValueObjectSynthetic::CalculateNumChildren(uint32_t max) {
8888
Log *log = GetLog(LLDBLog::DataFormatters);
8989

9090
UpdateValueIfNeeded();

lldb/source/Core/ValueObjectVTable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ValueObjectVTableChild : public ValueObject {
3333

3434
std::optional<uint64_t> GetByteSize() override { return m_addr_size; };
3535

36-
size_t CalculateNumChildren(uint32_t max) override { return 0; };
36+
uint32_t CalculateNumChildren(uint32_t max) override { return 0; };
3737

3838
ValueType GetValueType() const override { return eValueTypeVTableEntry; };
3939

@@ -159,7 +159,7 @@ std::optional<uint64_t> ValueObjectVTable::GetByteSize() {
159159
return std::nullopt;
160160
}
161161

162-
size_t ValueObjectVTable::CalculateNumChildren(uint32_t max) {
162+
uint32_t ValueObjectVTable::CalculateNumChildren(uint32_t max) {
163163
if (UpdateValueIfNeeded(false))
164164
return m_num_vtable_entries <= max ? m_num_vtable_entries : max;
165165
return 0;

lldb/source/Core/ValueObjectVariable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ConstString ValueObjectVariable::GetQualifiedTypeName() {
9494
return ConstString();
9595
}
9696

97-
size_t ValueObjectVariable::CalculateNumChildren(uint32_t max) {
97+
uint32_t ValueObjectVariable::CalculateNumChildren(uint32_t max) {
9898
CompilerType type(GetCompilerType());
9999

100100
if (!type.IsValid())

0 commit comments

Comments
 (0)