diff --git a/lldb/include/lldb/DataFormatters/TypeSynthetic.h b/lldb/include/lldb/DataFormatters/TypeSynthetic.h index 14e516964f250..c8d7d15588065 100644 --- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h +++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h @@ -51,7 +51,7 @@ class SyntheticChildrenFrontEnd { virtual lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) = 0; - virtual size_t GetIndexOfChildWithName(ConstString name) = 0; + virtual llvm::Expected GetIndexOfChildWithName(ConstString name) = 0; /// This function is assumed to always succeed and if it fails, the front-end /// should know to deal with it in the correct way (most probably, by refusing @@ -117,8 +117,9 @@ class SyntheticValueProviderFrontEnd : public SyntheticChildrenFrontEnd { lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override { return nullptr; } - size_t GetIndexOfChildWithName(ConstString name) override { - return UINT32_MAX; + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } lldb::ChildCacheState Update() override { @@ -343,7 +344,7 @@ class TypeFilterImpl : public SyntheticChildren { bool MightHaveChildren() override { return filter->GetCount() > 0; } - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; typedef std::shared_ptr SharedPointer; @@ -442,7 +443,7 @@ class ScriptedSyntheticChildren : public SyntheticChildren { bool MightHaveChildren() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; lldb::ValueObjectSP GetSyntheticValue() override; diff --git a/lldb/include/lldb/DataFormatters/VectorIterator.h b/lldb/include/lldb/DataFormatters/VectorIterator.h index d095f085cabab..bdfaca7349c6a 100644 --- a/lldb/include/lldb/DataFormatters/VectorIterator.h +++ b/lldb/include/lldb/DataFormatters/VectorIterator.h @@ -30,7 +30,7 @@ class VectorIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ExecutionContextRef m_exe_ctx_ref; diff --git a/lldb/include/lldb/Interpreter/ScriptInterpreter.h b/lldb/include/lldb/Interpreter/ScriptInterpreter.h index 25e82779f05c6..3a4a7ae924584 100644 --- a/lldb/include/lldb/Interpreter/ScriptInterpreter.h +++ b/lldb/include/lldb/Interpreter/ScriptInterpreter.h @@ -368,10 +368,10 @@ class ScriptInterpreter : public PluginInterface { return lldb::ValueObjectSP(); } - virtual int + virtual llvm::Expected GetIndexOfChildWithName(const StructuredData::ObjectSP &implementor, const char *child_name) { - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", child_name); } virtual bool diff --git a/lldb/include/lldb/Symbol/CompilerType.h b/lldb/include/lldb/Symbol/CompilerType.h index 671b5314c24a2..fdbc2057ac10f 100644 --- a/lldb/include/lldb/Symbol/CompilerType.h +++ b/lldb/include/lldb/Symbol/CompilerType.h @@ -444,8 +444,9 @@ class CompilerType { /// Lookup a child given a name. This function will match base class names and /// member member names in "clang_type" only, not descendants. - uint32_t GetIndexOfChildWithName(llvm::StringRef name, - bool omit_empty_base_classes) const; + llvm::Expected + GetIndexOfChildWithName(llvm::StringRef name, + bool omit_empty_base_classes) const; /// Lookup a child member given a name. This function will match member names /// only and will descend into "clang_type" children in search for the first diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h index 9e9edc09a0846..df87fea32b72a 100644 --- a/lldb/include/lldb/Symbol/TypeSystem.h +++ b/lldb/include/lldb/Symbol/TypeSystem.h @@ -373,9 +373,12 @@ class TypeSystem : public PluginInterface, bool &child_is_base_class, bool &child_is_deref_of_parent, ValueObject *valobj, uint64_t &language_flags) = 0; - virtual uint32_t GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, - llvm::StringRef name, - bool omit_empty_base_classes) = 0; + // Lookup a child given a name. This function will match base class names and + // member member names in "clang_type" only, not descendants. + virtual llvm::Expected + GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, + llvm::StringRef name, + bool omit_empty_base_classes) = 0; virtual size_t GetIndexOfChildMemberWithName( lldb::opaque_compiler_type_t type, llvm::StringRef name, diff --git a/lldb/include/lldb/ValueObject/ValueObject.h b/lldb/include/lldb/ValueObject/ValueObject.h index 06d2589002ed0..0add8ebeccdc8 100644 --- a/lldb/include/lldb/ValueObject/ValueObject.h +++ b/lldb/include/lldb/ValueObject/ValueObject.h @@ -498,7 +498,7 @@ class ValueObject { virtual lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name, bool can_create = true); - virtual size_t GetIndexOfChildWithName(llvm::StringRef name); + virtual llvm::Expected GetIndexOfChildWithName(llvm::StringRef name); llvm::Expected GetNumChildren(uint32_t max = UINT32_MAX); /// Like \c GetNumChildren but returns 0 on error. You probably diff --git a/lldb/include/lldb/ValueObject/ValueObjectRegister.h b/lldb/include/lldb/ValueObject/ValueObjectRegister.h index 0812dc575aaa1..3db4b00bd1b15 100644 --- a/lldb/include/lldb/ValueObject/ValueObjectRegister.h +++ b/lldb/include/lldb/ValueObject/ValueObjectRegister.h @@ -52,7 +52,7 @@ class ValueObjectRegisterSet : public ValueObject { lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name, bool can_create = true) override; - size_t GetIndexOfChildWithName(llvm::StringRef name) override; + llvm::Expected GetIndexOfChildWithName(llvm::StringRef name) override; protected: bool UpdateValue() override; diff --git a/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h b/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h index df205a258a997..cdb2b1ddc3646 100644 --- a/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h +++ b/lldb/include/lldb/ValueObject/ValueObjectSyntheticFilter.h @@ -57,7 +57,7 @@ class ValueObjectSynthetic : public ValueObject { lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name, bool can_create = true) override; - size_t GetIndexOfChildWithName(llvm::StringRef name) override; + llvm::Expected GetIndexOfChildWithName(llvm::StringRef name) override; lldb::ValueObjectSP GetDynamicValue(lldb::DynamicValueType valueType) override; diff --git a/lldb/source/API/SBValue.cpp b/lldb/source/API/SBValue.cpp index 6b91120f6427a..e5cdc8f311450 100644 --- a/lldb/source/API/SBValue.cpp +++ b/lldb/source/API/SBValue.cpp @@ -704,13 +704,15 @@ SBValue SBValue::GetChildAtIndex(uint32_t idx, uint32_t SBValue::GetIndexOfChildWithName(const char *name) { LLDB_INSTRUMENT_VA(this, name); - uint32_t idx = UINT32_MAX; ValueLocker locker; lldb::ValueObjectSP value_sp(GetSP(locker)); if (value_sp) { - idx = value_sp->GetIndexOfChildWithName(name); + if (auto idx_or_err = value_sp->GetIndexOfChildWithName(name)) + return *idx_or_err; + else + llvm::consumeError(idx_or_err.takeError()); } - return idx; + return UINT32_MAX; } SBValue SBValue::GetChildMemberWithName(const char *name) { diff --git a/lldb/source/DataFormatters/FormatterBytecode.cpp b/lldb/source/DataFormatters/FormatterBytecode.cpp index 7f3dbe0dba37d..714de74abcb3c 100644 --- a/lldb/source/DataFormatters/FormatterBytecode.cpp +++ b/lldb/source/DataFormatters/FormatterBytecode.cpp @@ -9,6 +9,7 @@ #include "FormatterBytecode.h" #include "lldb/Utility/LLDBLog.h" #include "lldb/ValueObject/ValueObject.h" +#include "lldb/ValueObject/ValueObjectConstResult.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/DataExtractor.h" #include "llvm/Support/Format.h" @@ -489,7 +490,10 @@ llvm::Error Interpret(std::vector &control, TYPE_CHECK(Object, String); auto name = data.Pop(); POP_VALOBJ(valobj); - data.Push((uint64_t)valobj->GetIndexOfChildWithName(name)); + if (auto index_or_err = valobj->GetIndexOfChildWithName(name)) + data.Push((uint64_t)*index_or_err); + else + return index_or_err.takeError(); break; } case sel_get_type: { diff --git a/lldb/source/DataFormatters/TypeSynthetic.cpp b/lldb/source/DataFormatters/TypeSynthetic.cpp index 7aa0670190b25..57009b07dc553 100644 --- a/lldb/source/DataFormatters/TypeSynthetic.cpp +++ b/lldb/source/DataFormatters/TypeSynthetic.cpp @@ -49,7 +49,7 @@ bool TypeFilterImpl::SetExpressionPathAtIndex(size_t i, return true; } -size_t +llvm::Expected TypeFilterImpl::FrontEnd::GetIndexOfChildWithName(ConstString name) { const char *name_cstr = name.GetCString(); if (name_cstr) { @@ -67,7 +67,8 @@ TypeFilterImpl::FrontEnd::GetIndexOfChildWithName(ConstString name) { } } } - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } std::string TypeFilterImpl::GetDescription() { @@ -218,10 +219,11 @@ bool ScriptedSyntheticChildren::FrontEnd::MightHaveChildren() { return m_interpreter->MightHaveChildrenSynthProviderInstance(m_wrapper_sp); } -size_t ScriptedSyntheticChildren::FrontEnd::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected +ScriptedSyntheticChildren::FrontEnd::GetIndexOfChildWithName(ConstString name) { if (!m_wrapper_sp || m_interpreter == nullptr) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return m_interpreter->GetIndexOfChildWithName(m_wrapper_sp, name.GetCString()); } diff --git a/lldb/source/DataFormatters/VectorType.cpp b/lldb/source/DataFormatters/VectorType.cpp index 162b075ec87d2..eab2612d1e941 100644 --- a/lldb/source/DataFormatters/VectorType.cpp +++ b/lldb/source/DataFormatters/VectorType.cpp @@ -269,11 +269,13 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd { return lldb::ChildCacheState::eRefetch; } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } diff --git a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp index 6a22501c98aab..23e83616e0843 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp @@ -144,9 +144,10 @@ class BlockPointerSyntheticFrontEnd : public SyntheticChildrenFrontEnd { return lldb::ChildCacheState::eRefetch; } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { if (!m_block_struct_type.IsValid()) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); const bool omit_empty_base_classes = false; return m_block_struct_type.GetIndexOfChildWithName(name.AsCString(), @@ -172,8 +173,17 @@ bool lldb_private::formatters::BlockPointerSummaryProvider( static const ConstString s_FuncPtr_name("__FuncPtr"); - lldb::ValueObjectSP child_sp = synthetic_children->GetChildAtIndex( - synthetic_children->GetIndexOfChildWithName(s_FuncPtr_name)); + auto index_or_err = + synthetic_children->GetIndexOfChildWithName(s_FuncPtr_name); + + if (!index_or_err) { + LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters), index_or_err.takeError(), + "{0}"); + return false; + } + + lldb::ValueObjectSP child_sp = + synthetic_children->GetChildAtIndex(*index_or_err); if (!child_sp) { return false; diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp index 76a10d2393782..376555936e89d 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp @@ -199,10 +199,12 @@ lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName( +llvm::Expected +StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { if (!m_resume_ptr_sp || !m_destroy_ptr_sp) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); if (name == ConstString("resume")) return 0; @@ -211,7 +213,8 @@ size_t StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName( if (name == ConstString("promise_ptr") && m_promise_ptr_sp) return 2; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h index c33c82bd2fc45..fd9445d46e6a0 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h +++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h @@ -40,7 +40,7 @@ class StdlibCoroutineHandleSyntheticFrontEnd lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: lldb::ValueObjectSP m_resume_ptr_sp; diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp index 03671c3efed6f..234471d5ba518 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp @@ -28,8 +28,12 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd { GenericBitsetFrontEnd(ValueObject &valobj, StdLib stdlib); - size_t GetIndexOfChildWithName(ConstString name) override { - return formatters::ExtractIndexFromString(name.GetCString()); + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + size_t idx = formatters::ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return idx; } lldb::ChildCacheState Update() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp index b224d3e859c84..6f1b2ee3fd9e3 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp @@ -36,10 +36,14 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd { GenericOptionalFrontend(ValueObject &valobj, StdLib stdlib); - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { if (name == "$$dereference$$") return 0; - return formatters::ExtractIndexFromString(name.GetCString()); + size_t idx = formatters::ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return idx; } llvm::Expected CalculateNumChildren() override { diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp index 63620c6bf0ddd..358cf7d78fa21 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp @@ -309,13 +309,15 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (name == "__ptr_") return 0; if (name == "$$dereference$$") return 1; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd:: @@ -407,7 +409,8 @@ lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (name == "pointer") return 0; @@ -415,7 +418,8 @@ size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd:: return 1; if (name == "$$dereference$$") return 2; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } bool lldb_private::formatters::LibcxxContainerSummaryProvider( @@ -456,9 +460,15 @@ ExtractLibcxxStringInfo(ValueObject &valobj) { if (!l) return {}; - StringLayout layout = l->GetIndexOfChildWithName("__data_") == 0 - ? StringLayout::DSC - : StringLayout::CSD; + auto index_or_err = l->GetIndexOfChildWithName("__data_"); + if (!index_or_err) { + LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters), index_or_err.takeError(), + "{0}"); + return {}; + } + + StringLayout layout = + *index_or_err == 0 ? StringLayout::DSC : StringLayout::CSD; bool short_mode = false; // this means the string is in short-mode and the // data is stored inline diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h index 21fbb361eb934..56501302d116f 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h @@ -102,7 +102,7 @@ class LibcxxSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; ~LibcxxSharedPtrSyntheticFrontEnd() override; @@ -120,7 +120,7 @@ class LibcxxUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; ~LibcxxUniquePtrSyntheticFrontEnd() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp index 3104f33ee80b3..606f9517ac0c4 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp @@ -96,7 +96,7 @@ class LibcxxStdAtomicSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ValueObject *m_real_child = nullptr; @@ -130,9 +130,13 @@ lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::GetChildAtIndex( return nullptr; } -size_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { - return name == "Value" ? 0 : UINT32_MAX; + if (name == "Value") + return 0; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp index ffc894256626c..45c80e8e4ec8d 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp @@ -32,7 +32,7 @@ class LibcxxInitializerListSyntheticFrontEnd lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ValueObject *m_start = nullptr; @@ -100,11 +100,19 @@ lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { - if (!m_start) - return UINT32_MAX; - return ExtractIndexFromString(name.GetCString()); + if (!m_start) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp index ae1ad2bfe7200..ea18c02ee6591 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp @@ -106,8 +106,12 @@ class ListIterator { class AbstractListFrontEnd : public SyntheticChildrenFrontEnd { public: - size_t GetIndexOfChildWithName(ConstString name) override { - return ExtractIndexFromString(name.GetCString()); + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return idx; } lldb::ChildCacheState Update() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp index d75f25f49fdb4..fec2d6f29ca54 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp @@ -197,7 +197,7 @@ class LibcxxStdMapSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: llvm::Expected CalculateNumChildrenForOldCompressedPairLayout(); @@ -235,7 +235,7 @@ class LibCxxMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; ~LibCxxMapIteratorSyntheticFrontEnd() override = default; @@ -393,9 +393,14 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd:: +llvm::Expected lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { - return ExtractIndexFromString(name.GetCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } SyntheticChildrenFrontEnd * @@ -488,10 +493,12 @@ lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::GetChildAtIndex( return m_pair_sp->GetChildAtIndex(idx); } -size_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_pair_sp) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return m_pair_sp->GetIndexOfChildWithName(name); } diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp index 23fcff5e88bb2..41fc704d5886f 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp @@ -41,7 +41,7 @@ class LibcxxStdProxyArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: /// A non-owning pointer to the array's __vp_. @@ -173,11 +173,18 @@ lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::Update() { return ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_base) - return std::numeric_limits::max(); - return ExtractIndexFromString(name.GetCString()); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp index 8f1e35b3bede9..9d55feedd400f 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp @@ -20,9 +20,11 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd { Update(); } - size_t GetIndexOfChildWithName(ConstString name) override { - return m_container_sp ? m_container_sp->GetIndexOfChildWithName(name) - : UINT32_MAX; + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + if (m_container_sp) + return m_container_sp->GetIndexOfChildWithName(name); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } lldb::ChildCacheState Update() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp index e8ab37a022fbc..72ccc84fabbe7 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp @@ -40,7 +40,7 @@ class LibcxxStdRangesRefViewSyntheticFrontEnd lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { // We only have a single child return 0; } diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp index dba80db3906f9..1c4d8509374f1 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp @@ -62,7 +62,7 @@ class LibcxxStdSliceArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: /// A non-owning pointer to slice_array.__vp_. @@ -144,11 +144,17 @@ lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd::Update() { return ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_start) - return std::numeric_limits::max(); - return ExtractIndexFromString(name.GetCString()); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return idx; } lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp index acda41024cf03..98992b60f86ca 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp @@ -55,7 +55,7 @@ class LibcxxStdSpanSyntheticFrontEnd : public SyntheticChildrenFrontEnd { // from the only other place it can be: the template argument. lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ValueObject *m_start = nullptr; ///< First element of span. Held, not owned. @@ -127,11 +127,17 @@ lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eReuse; } -size_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd:: - GetIndexOfChildWithName(ConstString name) { +llvm::Expected lldb_private::formatters:: + LibcxxStdSpanSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { if (!m_start) - return UINT32_MAX; - return ExtractIndexFromString(name.GetCString()); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp index 263ca8349b891..270aad5ea9310 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp @@ -20,8 +20,12 @@ class TupleFrontEnd: public SyntheticChildrenFrontEnd { Update(); } - size_t GetIndexOfChildWithName(ConstString name) override { - return formatters::ExtractIndexFromString(name.GetCString()); + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + size_t idx = formatters::ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return idx; } lldb::ChildCacheState Update() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp index 395ecc489a17e..313664e691c9f 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp @@ -40,7 +40,7 @@ class LibcxxStdUnorderedMapSyntheticFrontEnd lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: CompilerType GetNodeType(); @@ -68,7 +68,7 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: lldb::ValueObjectSP m_pair_sp; ///< ValueObject for the key/value pair @@ -291,9 +291,15 @@ lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { - return ExtractIndexFromString(name.GetCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } SyntheticChildrenFrontEnd * @@ -398,13 +404,15 @@ lldb::ValueObjectSP lldb_private::formatters:: return lldb::ValueObjectSP(); } -size_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (name == "first") return 0; if (name == "second") return 1; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp index 53ad3d91a62a4..172df6358789e 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp @@ -30,7 +30,7 @@ class LibcxxStdValarraySyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: /// A non-owning pointer to valarray's __begin_ member. @@ -123,11 +123,18 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::Update() { return ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_start || !m_finish) - return std::numeric_limits::max(); - return ExtractIndexFromString(name.GetCString()); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + size_t idx = ExtractIndexFromString(name.GetCString()); + if (idx == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return idx; } lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp index 701946d44cb40..4dfb79e6f826a 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp @@ -202,8 +202,12 @@ class VariantFrontEnd : public SyntheticChildrenFrontEnd { Update(); } - size_t GetIndexOfChildWithName(ConstString name) override { - return formatters::ExtractIndexFromString(name.GetCString()); + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + size_t index = formatters::ExtractIndexFromString(name.GetCString()); + if (index == UINT32_MAX) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + return index; } lldb::ChildCacheState Update() override; diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp index ce2261b6f03c3..4a3eca05b0a08 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp @@ -33,7 +33,7 @@ class LibcxxStdVectorSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ValueObject *m_start = nullptr; @@ -52,7 +52,7 @@ class LibcxxVectorBoolSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: CompilerType m_bool_type; @@ -163,11 +163,18 @@ lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_start || !m_finish) - return UINT32_MAX; - return ExtractIndexFromString(name.GetCString()); + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + size_t index = formatters::ExtractIndexFromString(name.GetCString()); + if (index == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return index; } lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd:: @@ -259,14 +266,18 @@ lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { if (!m_count || !m_base_data_address) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp index a97264f007076..02113baf64b8c 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp @@ -49,7 +49,7 @@ class LibstdcppMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ExecutionContextRef m_exe_ctx_ref; @@ -68,7 +68,8 @@ class LibStdcppSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; + private: // The lifetime of a ValueObject and all its derivative ValueObjects @@ -145,13 +146,15 @@ LibstdcppMapIteratorSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) { return lldb::ValueObjectSP(); } -size_t LibstdcppMapIteratorSyntheticFrontEnd::GetIndexOfChildWithName( +llvm::Expected +LibstdcppMapIteratorSyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { if (name == "first") return 0; if (name == "second") return 1; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } SyntheticChildrenFrontEnd * @@ -226,11 +229,12 @@ VectorIteratorSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) { return lldb::ValueObjectSP(); } -size_t VectorIteratorSyntheticFrontEnd::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected +VectorIteratorSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { if (name == "item") return 0; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } bool lldb_private::formatters::LibStdcppStringSummaryProvider( @@ -409,13 +413,14 @@ lldb::ChildCacheState LibStdcppSharedPtrSyntheticFrontEnd::Update() { return lldb::ChildCacheState::eRefetch; } -size_t LibStdcppSharedPtrSyntheticFrontEnd::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected +LibStdcppSharedPtrSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { if (name == "pointer") return 0; if (name == "object" || name == "$$dereference$$") return 1; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp index 68133b202a0c8..cae5aa379b245 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp @@ -32,7 +32,7 @@ class LibStdcppTupleSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: // The lifetime of a ValueObject and all its derivative ValueObjects @@ -96,9 +96,14 @@ LibStdcppTupleSyntheticFrontEnd::CalculateNumChildren() { return m_members.size(); } -size_t LibStdcppTupleSyntheticFrontEnd::GetIndexOfChildWithName( - ConstString name) { - return ExtractIndexFromString(name.GetCString()); +llvm::Expected +LibStdcppTupleSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { + size_t index = formatters::ExtractIndexFromString(name.GetCString()); + if (index == UINT32_MAX) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } + return index; } SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp index 722203f17e382..b47ff579b6a5e 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp @@ -32,7 +32,7 @@ class LibStdcppUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; bool GetSummary(Stream &stream, const TypeSummaryOptions &options); @@ -139,15 +139,16 @@ LibStdcppUniquePtrSyntheticFrontEnd::CalculateNumChildren() { return 1; } -size_t LibStdcppUniquePtrSyntheticFrontEnd::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected +LibStdcppUniquePtrSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { if (name == "ptr" || name == "pointer") return 0; if (name == "del" || name == "deleter") return 1; if (name == "obj" || name == "object" || name == "$$dereference$$") return 2; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } bool LibStdcppUniquePtrSyntheticFrontEnd::GetSummary( diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 1d79edbede5d6..72e4d0fe2aa21 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -1049,8 +1049,9 @@ class ObjCClassSyntheticChildrenFrontEnd : public SyntheticChildrenFrontEnd { bool MightHaveChildren() override { return false; } - size_t GetIndexOfChildWithName(ConstString name) override { - return UINT32_MAX; + llvm::Expected GetIndexOfChildWithName(ConstString name) override { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } }; diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp b/lldb/source/Plugins/Language/ObjC/NSArray.cpp index 7054dd8ffa952..5e72bd5a6bab6 100644 --- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp @@ -56,7 +56,7 @@ class NSArrayMSyntheticFrontEndBase : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override = 0; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; protected: virtual lldb::addr_t GetDataAddress() = 0; @@ -218,7 +218,7 @@ class GenericNSArrayISyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ExecutionContextRef m_exe_ctx_ref; @@ -306,7 +306,7 @@ class NSArray0SyntheticFrontEnd : public SyntheticChildrenFrontEnd { bool MightHaveChildren() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; }; class NSArray1SyntheticFrontEnd : public SyntheticChildrenFrontEnd { @@ -321,7 +321,7 @@ class NSArray1SyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; }; } // namespace formatters } // namespace lldb_private @@ -526,13 +526,14 @@ lldb_private::formatters::GenericNSArrayMSyntheticFrontEnd::Update() { : lldb::ChildCacheState::eRefetch; } -size_t -lldb_private::formatters::NSArrayMSyntheticFrontEndBase::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected lldb_private::formatters::NSArrayMSyntheticFrontEndBase:: + GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); - uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + size_t idx = ExtractIndexFromString(item_name); + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -612,13 +613,15 @@ lldb_private::formatters::GenericNSArrayISyntheticFrontEnd:: } template -size_t -lldb_private::formatters::GenericNSArrayISyntheticFrontEnd:: - GetIndexOfChildWithName(ConstString name) { +llvm::Expected +lldb_private::formatters::GenericNSArrayISyntheticFrontEnd< + D32, D64, Inline>::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -695,7 +698,7 @@ lldb_private::formatters::NSArray0SyntheticFrontEnd::NSArray0SyntheticFrontEnd( lldb::ValueObjectSP valobj_sp) : SyntheticChildrenFrontEnd(*valobj_sp) {} -size_t +llvm::Expected lldb_private::formatters::NSArray0SyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { return UINT32_MAX; @@ -725,7 +728,7 @@ lldb_private::formatters::NSArray1SyntheticFrontEnd::NSArray1SyntheticFrontEnd( lldb::ValueObjectSP valobj_sp) : SyntheticChildrenFrontEnd(*valobj_sp.get()) {} -size_t +llvm::Expected lldb_private::formatters::NSArray1SyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { static const ConstString g_zero("[0]"); diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp index 008e8eb569f01..b04b4610a0bf4 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp @@ -109,7 +109,7 @@ class NSDictionaryISyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: struct DataDescriptor_32 { @@ -148,7 +148,7 @@ class NSConstantDictionarySyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ExecutionContextRef m_exe_ctx_ref; @@ -178,7 +178,7 @@ class NSCFDictionarySyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: struct DictionaryItemDescriptor { @@ -209,7 +209,7 @@ class NSDictionary1SyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: ValueObjectSP m_pair; @@ -228,7 +228,7 @@ class GenericNSDictionaryMSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: struct DictionaryItemDescriptor { @@ -259,8 +259,8 @@ namespace Foundation1100 { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; - + llvm::Expected GetIndexOfChildWithName(ConstString name) override; + private: struct DataDescriptor_32 { uint32_t _used : 26; @@ -585,12 +585,14 @@ lldb_private::formatters::NSDictionaryISyntheticFrontEnd:: m_data_64 = nullptr; } -size_t lldb_private::formatters::NSDictionaryISyntheticFrontEnd:: - GetIndexOfChildWithName(ConstString name) { +llvm::Expected lldb_private::formatters:: + NSDictionaryISyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -718,12 +720,14 @@ lldb_private::formatters::NSCFDictionarySyntheticFrontEnd:: : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_hashtable(), m_pair_type() {} -size_t lldb_private::formatters::NSCFDictionarySyntheticFrontEnd:: - GetIndexOfChildWithName(ConstString name) { +llvm::Expected lldb_private::formatters:: + NSCFDictionarySyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); const uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString(), idx); return idx; } @@ -849,12 +853,15 @@ lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd:: NSConstantDictionarySyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) : SyntheticChildrenFrontEnd(*valobj_sp) {} -size_t lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd:: +llvm::Expected +lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd:: GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -961,10 +968,13 @@ lldb_private::formatters::NSDictionary1SyntheticFrontEnd:: NSDictionary1SyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) : SyntheticChildrenFrontEnd(*valobj_sp.get()), m_pair(nullptr) {} -size_t lldb_private::formatters::NSDictionary1SyntheticFrontEnd:: - GetIndexOfChildWithName(ConstString name) { +llvm::Expected lldb_private::formatters:: + NSDictionary1SyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { static const ConstString g_zero("[0]"); - return name == g_zero ? 0 : UINT32_MAX; + if (name == g_zero) + return 0; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } llvm::Expected lldb_private::formatters:: @@ -1045,12 +1055,15 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd< } template -size_t lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd< +llvm::Expected +lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd< D32, D64>::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -1202,13 +1215,14 @@ lldb_private::formatters::Foundation1100:: m_data_64 = nullptr; } -size_t -lldb_private::formatters::Foundation1100:: - NSDictionaryMSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { +llvm::Expected lldb_private::formatters::Foundation1100:: + NSDictionaryMSyntheticFrontEnd::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } diff --git a/lldb/source/Plugins/Language/ObjC/NSError.cpp b/lldb/source/Plugins/Language/ObjC/NSError.cpp index 5557daa2bf1b2..0152c3125f1e1 100644 --- a/lldb/source/Plugins/Language/ObjC/NSError.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSError.cpp @@ -165,11 +165,12 @@ class NSErrorSyntheticFrontEnd : public SyntheticChildrenFrontEnd { return lldb::ChildCacheState::eRefetch; } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { static ConstString g_userInfo("_userInfo"); if (name == g_userInfo) return 0; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } private: diff --git a/lldb/source/Plugins/Language/ObjC/NSException.cpp b/lldb/source/Plugins/Language/ObjC/NSException.cpp index 67f3f1779e147..e27c7e0e97bef 100644 --- a/lldb/source/Plugins/Language/ObjC/NSException.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSException.cpp @@ -148,7 +148,7 @@ class NSExceptionSyntheticFrontEnd : public SyntheticChildrenFrontEnd { : lldb::ChildCacheState::eRefetch; } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { // NSException has 4 members: // NSString *name; // NSString *reason; @@ -162,7 +162,8 @@ class NSExceptionSyntheticFrontEnd : public SyntheticChildrenFrontEnd { if (name == g_reason) return 1; if (name == g_userInfo) return 2; if (name == g_reserved) return 3; - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } private: diff --git a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp index e29f625b405b0..93d852b7e748c 100644 --- a/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp @@ -126,11 +126,13 @@ class NSIndexPathSyntheticFrontEnd : public SyntheticChildrenFrontEnd { bool MightHaveChildren() override { return m_impl.m_mode != Mode::Invalid; } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp index 55069495676e5..71674ea63f4ca 100644 --- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp @@ -52,7 +52,7 @@ class NSSetISyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: struct DataDescriptor_32 { @@ -88,7 +88,7 @@ class NSCFSetSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: struct SetItemDescriptor { @@ -119,7 +119,7 @@ class GenericNSSetMSyntheticFrontEnd : public SyntheticChildrenFrontEnd { lldb::ChildCacheState Update() override; - size_t GetIndexOfChildWithName(ConstString name) override; + llvm::Expected GetIndexOfChildWithName(ConstString name) override; private: @@ -386,13 +386,15 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::~NSSetISyntheticFrontEnd() { m_data_64 = nullptr; } -size_t +llvm::Expected lldb_private::formatters::NSSetISyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -519,13 +521,15 @@ lldb_private::formatters::NSCFSetSyntheticFrontEnd::NSCFSetSyntheticFrontEnd( : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_hashtable(), m_pair_type() {} -size_t +llvm::Expected lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetIndexOfChildWithName( ConstString name) { const char *item_name = name.GetCString(); const uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } @@ -654,14 +658,14 @@ lldb_private::formatters::GenericNSSetMSyntheticFrontEnd:: } template -size_t -lldb_private::formatters:: - GenericNSSetMSyntheticFrontEnd::GetIndexOfChildWithName( - ConstString name) { +llvm::Expected lldb_private::formatters::GenericNSSetMSyntheticFrontEnd< + D32, D64>::GetIndexOfChildWithName(ConstString name) { const char *item_name = name.GetCString(); uint32_t idx = ExtractIndexFromString(item_name); - if (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()) - return UINT32_MAX; + if (idx == UINT32_MAX || + (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors())) + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); return idx; } diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 553ee7e80b359..16c3226c7f62b 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -2037,19 +2037,19 @@ lldb::ValueObjectSP ScriptInterpreterPythonImpl::GetChildAtIndex( return ret_val; } -int ScriptInterpreterPythonImpl::GetIndexOfChildWithName( +llvm::Expected ScriptInterpreterPythonImpl::GetIndexOfChildWithName( const StructuredData::ObjectSP &implementor_sp, const char *child_name) { if (!implementor_sp) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", child_name); StructuredData::Generic *generic = implementor_sp->GetAsGeneric(); if (!generic) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", child_name); auto *implementor = static_cast(generic->GetValue()); if (!implementor) - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", child_name); - int ret_val = UINT32_MAX; + int ret_val = INT32_MAX; { Locker py_lock(this, @@ -2058,6 +2058,8 @@ int ScriptInterpreterPythonImpl::GetIndexOfChildWithName( child_name); } + if (ret_val == INT32_MAX) + return llvm::createStringError("Type has no child named '%s'", child_name); return ret_val; } diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h index 0f2902813397a..5d776080be8f4 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h @@ -128,8 +128,9 @@ class ScriptInterpreterPythonImpl : public ScriptInterpreterPython { GetChildAtIndex(const StructuredData::ObjectSP &implementor, uint32_t idx) override; - int GetIndexOfChildWithName(const StructuredData::ObjectSP &implementor, - const char *child_name) override; + llvm::Expected + GetIndexOfChildWithName(const StructuredData::ObjectSP &implementor, + const char *child_name) override; bool UpdateSynthProviderInstance( const StructuredData::ObjectSP &implementor) override; diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp index ed6297cc6f3e0..4d6220c48137f 100644 --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -6969,7 +6969,7 @@ size_t TypeSystemClang::GetIndexOfChildMemberWithName( // doesn't descend into the children, but only looks one level deep and name // matches can include base class names. -uint32_t +llvm::Expected TypeSystemClang::GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, llvm::StringRef name, bool omit_empty_base_classes) { @@ -7159,7 +7159,8 @@ TypeSystemClang::GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, break; } } - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.str().c_str()); } CompilerType diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h index 442f88a5b79ae..93933846d114d 100644 --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h @@ -900,9 +900,10 @@ class TypeSystemClang : public TypeSystem { // Lookup a child given a name. This function will match base class names and // member member names in "clang_type" only, not descendants. - uint32_t GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, - llvm::StringRef name, - bool omit_empty_base_classes) override; + llvm::Expected + GetIndexOfChildWithName(lldb::opaque_compiler_type_t type, + llvm::StringRef name, + bool omit_empty_base_classes) override; // Lookup a child member given a name. This function will match member names // only and will descend into "clang_type" children in search for the first diff --git a/lldb/source/Symbol/CompilerType.cpp b/lldb/source/Symbol/CompilerType.cpp index 8e89d006d08d3..90c4dbf0c6206 100644 --- a/lldb/source/Symbol/CompilerType.cpp +++ b/lldb/source/Symbol/CompilerType.cpp @@ -1023,7 +1023,7 @@ bool CompilerType::IsMeaninglessWithoutDynamicResolution() const { // doesn't descend into the children, but only looks one level deep and name // matches can include base class names. -uint32_t +llvm::Expected CompilerType::GetIndexOfChildWithName(llvm::StringRef name, bool omit_empty_base_classes) const { if (IsValid() && !name.empty()) { @@ -1031,7 +1031,8 @@ CompilerType::GetIndexOfChildWithName(llvm::StringRef name, return type_system_sp->GetIndexOfChildWithName(m_type, name, omit_empty_base_classes); } - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.str().c_str()); } // Dumping types diff --git a/lldb/source/ValueObject/ValueObject.cpp b/lldb/source/ValueObject/ValueObject.cpp index 8741cb7343166..17559368ee6bc 100644 --- a/lldb/source/ValueObject/ValueObject.cpp +++ b/lldb/source/ValueObject/ValueObject.cpp @@ -403,7 +403,8 @@ ValueObject::GetChildAtNamePath(llvm::ArrayRef names) { return root; } -size_t ValueObject::GetIndexOfChildWithName(llvm::StringRef name) { +llvm::Expected +ValueObject::GetIndexOfChildWithName(llvm::StringRef name) { bool omit_empty_base_classes = true; return GetCompilerType().GetIndexOfChildWithName(name, omit_empty_base_classes); diff --git a/lldb/source/ValueObject/ValueObjectRegister.cpp b/lldb/source/ValueObject/ValueObjectRegister.cpp index a56d3160d9ae2..97aeaa8bebe63 100644 --- a/lldb/source/ValueObject/ValueObjectRegister.cpp +++ b/lldb/source/ValueObject/ValueObjectRegister.cpp @@ -139,13 +139,15 @@ ValueObjectRegisterSet::GetChildMemberWithName(llvm::StringRef name, return ValueObjectSP(); } -size_t ValueObjectRegisterSet::GetIndexOfChildWithName(llvm::StringRef name) { +llvm::Expected +ValueObjectRegisterSet::GetIndexOfChildWithName(llvm::StringRef name) { if (m_reg_ctx_sp && m_reg_set) { const RegisterInfo *reg_info = m_reg_ctx_sp->GetRegisterInfoByName(name); if (reg_info != nullptr) return reg_info->kinds[eRegisterKindLLDB]; } - return UINT32_MAX; + return llvm::createStringError("Type has no child named '%s'", + name.str().c_str()); } #pragma mark - diff --git a/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp b/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp index ae2b9bebbb12d..df774284e4c1b 100644 --- a/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp +++ b/lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp @@ -39,7 +39,7 @@ class DummySyntheticFrontEnd : public SyntheticChildrenFrontEnd { return m_backend.GetChildAtIndex(idx); } - size_t GetIndexOfChildWithName(ConstString name) override { + llvm::Expected GetIndexOfChildWithName(ConstString name) override { return m_backend.GetIndexOfChildWithName(name); } @@ -319,40 +319,45 @@ ValueObjectSynthetic::GetChildMemberWithName(llvm::StringRef name, bool can_create) { UpdateValueIfNeeded(); - uint32_t index = GetIndexOfChildWithName(name); + auto index_or_err = GetIndexOfChildWithName(name); - if (index == UINT32_MAX) + if (!index_or_err) { + llvm::consumeError(index_or_err.takeError()); return lldb::ValueObjectSP(); + } - return GetChildAtIndex(index, can_create); + return GetChildAtIndex(*index_or_err, can_create); } -size_t ValueObjectSynthetic::GetIndexOfChildWithName(llvm::StringRef name_ref) { +llvm::Expected +ValueObjectSynthetic::GetIndexOfChildWithName(llvm::StringRef name_ref) { UpdateValueIfNeeded(); ConstString name(name_ref); - uint32_t found_index = UINT32_MAX; - bool did_find; + std::optional found_index = std::nullopt; { std::lock_guard guard(m_child_mutex); auto name_to_index = m_name_toindex.find(name.GetCString()); - did_find = name_to_index != m_name_toindex.end(); - if (did_find) + if (name_to_index != m_name_toindex.end()) found_index = name_to_index->second; } - if (!did_find && m_synth_filter_up != nullptr) { - uint32_t index = m_synth_filter_up->GetIndexOfChildWithName(name); - if (index == UINT32_MAX) - return index; + if (!found_index && m_synth_filter_up != nullptr) { + auto index_or_err = m_synth_filter_up->GetIndexOfChildWithName(name); + if (!index_or_err) + return index_or_err.takeError(); std::lock_guard guard(m_child_mutex); - m_name_toindex[name.GetCString()] = index; - return index; - } else if (!did_find && m_synth_filter_up == nullptr) - return UINT32_MAX; - else /*if (iter != m_name_toindex.end())*/ - return found_index; + m_name_toindex[name.GetCString()] = *index_or_err; + return *index_or_err; + } else if (!found_index && m_synth_filter_up == nullptr) { + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); + } else if (found_index) + return *found_index; + + return llvm::createStringError("Type has no child named '%s'", + name.AsCString()); } bool ValueObjectSynthetic::IsInScope() { return m_parent->IsInScope(); } diff --git a/lldb/unittests/Platform/PlatformSiginfoTest.cpp b/lldb/unittests/Platform/PlatformSiginfoTest.cpp index b9f1fe4bbaadf..621c36c3b8dc4 100644 --- a/lldb/unittests/Platform/PlatformSiginfoTest.cpp +++ b/lldb/unittests/Platform/PlatformSiginfoTest.cpp @@ -61,9 +61,10 @@ class PlatformSiginfoTest : public ::testing::Test { for (auto field_name : llvm::split(path, '.')) { uint64_t bit_offset; std::string name; - field_type = field_type.GetFieldAtIndex( - field_type.GetIndexOfChildWithName(field_name, false), name, - &bit_offset, nullptr, nullptr); + auto index_or_err = field_type.GetIndexOfChildWithName(field_name, false); + ASSERT_FALSE(!index_or_err); + field_type = field_type.GetFieldAtIndex(*index_or_err, name, &bit_offset, + nullptr, nullptr); ASSERT_TRUE(field_type); total_offset += bit_offset; }