Skip to content

Change the return type of CalculateNumChildren to uint32_t. #83501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lldb/include/lldb/Core/ValueObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(uint32_t idx,
bool can_create = true);

// The method always creates missing children in the path, if necessary.
Expand Down Expand Up @@ -791,7 +791,7 @@ class ValueObject {
return (m_children.find(idx) != m_children.end());
}

ValueObject *GetChildAtIndex(size_t idx) {
ValueObject *GetChildAtIndex(uint32_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);
Expand Down Expand Up @@ -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 uint32_t CalculateNumChildren(uint32_t max = UINT32_MAX) = 0;

void SetNumChildren(size_t num_children);

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectCast.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ValueObjectCast : public ValueObject {

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

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueType GetValueType() const override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectChild.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ValueObjectChild : public ValueObject {

lldb::ValueType GetValueType() const override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

ConstString GetTypeName() override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectConstResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ValueObjectConstResult : public ValueObject {

lldb::ValueType GetValueType() const override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

ConstString GetTypeName() override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectDynamicValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ValueObjectDynamicValue : public ValueObject {

ConstString GetDisplayTypeName() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueType GetValueType() const override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectMemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ValueObjectMemory : public ValueObject {

ConstString GetDisplayTypeName() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueType GetValueType() const override;

Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/ValueObjectRegister.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ValueObjectRegisterSet : public ValueObject {

ConstString GetQualifiedTypeName() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

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

ConstString GetTypeName() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

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

Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ class ValueObjectSynthetic : public ValueObject {

bool MightHaveChildren() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueType GetValueType() const override;

lldb::ValueObjectSP GetChildAtIndex(size_t idx,
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx,
bool can_create = true) override;

lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name,
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectVTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class ValueObjectVTable : public ValueObject {

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

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

ValueObject *CreateChildAtIndex(size_t idx, bool synthetic_array_member,
int32_t synthetic_index) override;
Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Core/ValueObjectVariable.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ValueObjectVariable : public ValueObject {

ConstString GetDisplayTypeName() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueType GetValueType() const override;

Expand Down
20 changes: 10 additions & 10 deletions lldb/include/lldb/DataFormatters/TypeSynthetic.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ class SyntheticChildrenFrontEnd {

virtual ~SyntheticChildrenFrontEnd() = default;

virtual size_t CalculateNumChildren() = 0;
virtual uint32_t CalculateNumChildren() = 0;

virtual size_t CalculateNumChildren(uint32_t max) {
virtual uint32_t CalculateNumChildren(uint32_t max) {
auto count = CalculateNumChildren();
return count <= max ? count : max;
}

virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx) = 0;
virtual lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) = 0;

virtual size_t GetIndexOfChildWithName(ConstString name) = 0;

Expand Down Expand Up @@ -109,9 +109,9 @@ class SyntheticValueProviderFrontEnd : public SyntheticChildrenFrontEnd {

~SyntheticValueProviderFrontEnd() override = default;

size_t CalculateNumChildren() override { return 0; }
uint32_t CalculateNumChildren() override { return 0; }

lldb::ValueObjectSP GetChildAtIndex(size_t idx) override { return nullptr; }
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override { return nullptr; }

size_t GetIndexOfChildWithName(ConstString name) override {
return UINT32_MAX;
Expand Down Expand Up @@ -322,9 +322,9 @@ class TypeFilterImpl : public SyntheticChildren {

~FrontEnd() override = default;

size_t CalculateNumChildren() override { return filter->GetCount(); }
uint32_t CalculateNumChildren() override { return filter->GetCount(); }

lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
if (idx >= filter->GetCount())
return lldb::ValueObjectSP();
return m_backend.GetSyntheticExpressionPathChild(
Expand Down Expand Up @@ -426,11 +426,11 @@ class ScriptedSyntheticChildren : public SyntheticChildren {

bool IsValid();

size_t CalculateNumChildren() override;
uint32_t CalculateNumChildren() override;

size_t CalculateNumChildren(uint32_t max) override;
uint32_t CalculateNumChildren(uint32_t max) override;

lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;

lldb::ChildCacheState Update() override;

Expand Down
4 changes: 2 additions & 2 deletions lldb/include/lldb/DataFormatters/VectorIterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class VectorIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
VectorIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp,
llvm::ArrayRef<ConstString> item_names);

size_t CalculateNumChildren() override;
uint32_t CalculateNumChildren() override;

lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;

lldb::ChildCacheState Update() override;

Expand Down
2 changes: 1 addition & 1 deletion lldb/include/lldb/Target/StackFrameRecognizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class ValueObjectRecognizerSynthesizedValue : public ValueObject {
m_value = m_parent->GetValue();
return true;
}
size_t CalculateNumChildren(uint32_t max = UINT32_MAX) override {
uint32_t CalculateNumChildren(uint32_t max = UINT32_MAX) override {
return m_parent->GetNumChildren(max);
}
CompilerType GetCompilerTypeImpl() override {
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ bool ValueObject::IsLogicalTrue(Status &error) {
return ret;
}

ValueObjectSP ValueObject::GetChildAtIndex(size_t idx, bool can_create) {
ValueObjectSP ValueObject::GetChildAtIndex(uint32_t idx, bool can_create) {
ValueObjectSP child_sp;
// We may need to update our value if we are dynamic
if (IsPossibleDynamicType())
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectCast.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ValueObjectCast::~ValueObjectCast() = default;

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

size_t ValueObjectCast::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectCast::CalculateNumChildren(uint32_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(
true, &exe_ctx);
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectChild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ lldb::ValueType ValueObjectChild::GetValueType() const {
return m_parent->GetValueType();
}

size_t ValueObjectChild::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectChild::CalculateNumChildren(uint32_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectConstResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
uint32_t ValueObjectConstResult::CalculateNumChildren(uint32_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectDynamicValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ConstString ValueObjectDynamicValue::GetDisplayTypeName() {
return m_parent->GetDisplayTypeName();
}

size_t ValueObjectDynamicValue::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectDynamicValue::CalculateNumChildren(uint32_t max) {
const bool success = UpdateValueIfNeeded(false);
if (success && m_dynamic_type_info.HasType()) {
ExecutionContext exe_ctx(GetExecutionContextRef());
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectMemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ConstString ValueObjectMemory::GetDisplayTypeName() {
return m_compiler_type.GetDisplayTypeName();
}

size_t ValueObjectMemory::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectMemory::CalculateNumChildren(uint32_t max) {
if (m_type_sp) {
auto child_count = m_type_sp->GetNumChildren(true);
return child_count <= max ? child_count : max;
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Core/ValueObjectRegister.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ConstString ValueObjectRegisterSet::GetQualifiedTypeName() {
return ConstString();
}

size_t ValueObjectRegisterSet::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectRegisterSet::CalculateNumChildren(uint32_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;
Expand Down Expand Up @@ -220,7 +220,7 @@ ConstString ValueObjectRegister::GetTypeName() {
return m_type_name;
}

size_t ValueObjectRegister::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectRegister::CalculateNumChildren(uint32_t max) {
ExecutionContext exe_ctx(GetExecutionContextRef());
auto children_count = GetCompilerType().GetNumChildren(true, &exe_ctx);
return children_count <= max ? children_count : max;
Expand Down
18 changes: 9 additions & 9 deletions lldb/source/Core/ValueObjectSyntheticFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class DummySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
DummySyntheticFrontEnd(ValueObject &backend)
: SyntheticChildrenFrontEnd(backend) {}

size_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }
uint32_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }

lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
return m_backend.GetChildAtIndex(idx);
}

Expand Down Expand Up @@ -84,7 +84,7 @@ ConstString ValueObjectSynthetic::GetDisplayTypeName() {
return m_parent->GetDisplayTypeName();
}

size_t ValueObjectSynthetic::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectSynthetic::CalculateNumChildren(uint32_t max) {
Log *log = GetLog(LLDBLog::DataFormatters);

UpdateValueIfNeeded();
Expand Down Expand Up @@ -236,13 +236,13 @@ bool ValueObjectSynthetic::UpdateValue() {
return true;
}

lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(uint32_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 %u",
GetName().AsCString(), idx);

UpdateValueIfNeeded();
Expand All @@ -261,15 +261,15 @@ 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 %u not cached and will be created",
GetName().AsCString(), idx);

lldb::ValueObjectSP synth_guy = m_synth_filter_up->GetChildAtIndex(idx);

LLDB_LOGF(
log,
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at index "
"%zu created as %p (is "
"%u created as %p (is "
"synthetic: %s)",
GetName().AsCString(), idx, static_cast<void *>(synth_guy.get()),
synth_guy.get()
Expand All @@ -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 %u 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()));
Expand All @@ -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 %u cached as %p",
GetName().AsCString(), idx, static_cast<void *>(valobj));

return valobj->GetSP();
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Core/ValueObjectVTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
uint32_t CalculateNumChildren(uint32_t max) override { return 0; };

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

Expand Down Expand Up @@ -159,7 +159,7 @@ std::optional<uint64_t> ValueObjectVTable::GetByteSize() {
return std::nullopt;
}

size_t ValueObjectVTable::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectVTable::CalculateNumChildren(uint32_t max) {
if (UpdateValueIfNeeded(false))
return m_num_vtable_entries <= max ? m_num_vtable_entries : max;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/ValueObjectVariable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ConstString ValueObjectVariable::GetQualifiedTypeName() {
return ConstString();
}

size_t ValueObjectVariable::CalculateNumChildren(uint32_t max) {
uint32_t ValueObjectVariable::CalculateNumChildren(uint32_t max) {
CompilerType type(GetCompilerType());

if (!type.IsValid())
Expand Down
6 changes: 3 additions & 3 deletions lldb/source/DataFormatters/TypeSynthetic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(uint32_t idx) {
if (!m_wrapper_sp || !m_interpreter)
return lldb::ValueObjectSP();

Expand All @@ -178,13 +178,13 @@ bool ScriptedSyntheticChildren::FrontEnd::IsValid() {
return (m_wrapper_sp && m_wrapper_sp->IsValid() && m_interpreter);
}

size_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren() {
uint32_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) {
uint32_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren(uint32_t max) {
if (!m_wrapper_sp || m_interpreter == nullptr)
return 0;
return m_interpreter->CalculateNumChildren(m_wrapper_sp, max);
Expand Down
Loading