[lldb] Upgrade GetIndexOfChildWithName to use llvm::Expected

lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp

@@ -207,8 +207,7 @@ StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
         "'SyntheticChildrenFrontend::StdlibCoroutineHandleSyntheticFrontEnd' "
         "cannot find index of child '%s'. (m_resume_ptr_sp='%p', "
         "m_destroy_ptr_sp='%p')",
-        name.AsCString(), static_cast<void *>(m_resume_ptr_sp.get()),
-        static_cast<void *>(m_destroy_ptr_sp.get()));
+        name.AsCString(), m_resume_ptr_sp.get(), m_destroy_ptr_sp.get());
 
   if (name == ConstString("resume"))
     return 0;

lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp

@@ -466,7 +466,8 @@ ExtractLibcxxStringInfo(ValueObject &valobj) {
 
   auto index_or_err = l->GetIndexOfChildWithName("__data_");
   if (!index_or_err) {
-    LLDB_LOG_ERROR(GetLog(LLDBLog::Types), index_or_err.takeError(), "{0}");
+    LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters), index_or_err.takeError(),
+                   "{0}");
     return {};
   }
 

lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp

@@ -106,7 +106,7 @@ lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
   if (!m_start) {
     return llvm::createStringError(
         "'SyntheticChildrenFrontend::LibcxxInitializerListSyntheticFrontEnd' "
-        "cannot find index of child '%s'",
+        "cannot find index of child '%s': Invalid start pointer.",
         name.AsCString());
   }
   size_t idx = ExtractIndexFromString(name.GetCString());

lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp

@@ -501,9 +501,8 @@ lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
   if (!m_pair_sp)
     return llvm::createStringError(
         "'SyntheticChildrenFrontend::LibCxxMapIteratorSyntheticFrontEnd' "
-        "cannot find index of child '%s'. Underlying pair is invalid: "
-        "m_pair_sp=%p",
-        name.AsCString(), static_cast<void *>(m_pair_sp.get()));
+        "cannot find index of child '%s': Invalid underlying pair.",
+        name.AsCString());
 
   return m_pair_sp->GetIndexOfChildWithName(name);
 }

lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp

@@ -179,7 +179,7 @@ lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::
   if (!m_base)
     return llvm::createStringError(
         "'SyntheticChildrenFrontend::LibcxxStdProxyArraySyntheticFrontEnd' "
-        "cannot find index of child '%s'",
+        "cannot find index of child '%s': Invalid base pointer.",
         name.AsCString());
   size_t idx = ExtractIndexFromString(name.GetCString());
   if (idx == UINT32_MAX) {

lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp

@@ -23,9 +23,10 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
   llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
     if (m_container_sp)
       return m_container_sp->GetIndexOfChildWithName(name);
-    return llvm::createStringError("'SyntheticChildrenFrontend::QueueFrontEnd' "
-                                   "cannot find index of child '%s'",
-                                   name.AsCString());
+    return llvm::createStringError(
+        "'SyntheticChildrenFrontend::QueueFrontEnd' "
+        "cannot find index of child '%s': Invalid underlying container.",
+        name.AsCString());
   }
 
   lldb::ChildCacheState Update() override;

lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp

@@ -150,7 +150,7 @@ lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd::
   if (!m_start)
     return llvm::createStringError(
         "'SyntheticChildrenFrontend::LibcxxStdSliceArraySyntheticFrontEnd' "
-        "cannot find index of child '%s'",
+        "cannot find index of child '%s': Invalid start pointer.",
         name.AsCString());
   size_t idx = ExtractIndexFromString(name.GetCString());
   if (idx == UINT32_MAX) {

lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp

@@ -132,7 +132,7 @@ llvm::Expected<size_t> lldb_private::formatters::
   if (!m_start)
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::LibcxxStdSpanSyntheticFrontEnd' cannot "
-        "find index of child '%s'",
+        "find index of child '%s': Invalid start pointer.",
         name.AsCString());
   size_t idx = ExtractIndexFromString(name.GetCString());
   if (idx == UINT32_MAX) {

lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp

@@ -129,8 +129,8 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
   if (!m_start || !m_finish)
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::LibcxxStdValarraySyntheticFrontEnd' "
-        "cannot find index of child '%s'",
-        name.AsCString());
+        "cannot find index of child '%s'. (m_start='%d', m_finish='%d')",
+        name.AsCString(), m_start, m_finish);
   size_t idx = ExtractIndexFromString(name.GetCString());
   if (idx == UINT32_MAX) {
     return llvm::createStringError(

lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp

@@ -169,8 +169,8 @@ lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
   if (!m_start || !m_finish)
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::LibcxxStdVectorSyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (m_start='%d', m_finish='%d')",
+        name.AsCString(), m_start, m_finish);
   size_t index = formatters::ExtractIndexFromString(name.GetCString());
   if (index == UINT32_MAX) {
     return llvm::createStringError(
@@ -277,8 +277,8 @@ lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
   if (!m_count || !m_base_data_address)
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::LibcxxVectorBoolSyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (m_count='%d', m_base_data_address='%d')",
+        name.AsCString(), m_count, m_base_data_address);
   const char *item_name = name.GetCString();
   uint32_t idx = ExtractIndexFromString(item_name);
   if (idx == UINT32_MAX ||

lldb/source/Plugins/Language/ObjC/NSArray.cpp

@@ -534,8 +534,8 @@ llvm::Expected<size_t> lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontend::NSArrayMSyntheticFrontEndBase' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -624,8 +624,8 @@ lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::ObjCClassSyntheticChildrenFrontEnd' "
-        "cannot find index of child '%s'",
-        name.AsCString());
+        "cannot find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 

lldb/source/Plugins/Language/ObjC/NSDictionary.cpp

@@ -593,8 +593,8 @@ llvm::Expected<size_t> lldb_private::formatters::
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSDictionaryISyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -730,8 +730,8 @@ llvm::Expected<size_t> lldb_private::formatters::
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSCFDictionarySyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -866,8 +866,8 @@ lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSConstantDictionarySyntheticFrontEnd' "
-        "cannot find index of child '%s'",
-        name.AsCString());
+        "cannot find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -1072,8 +1072,8 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::GenericNSDictionaryMSyntheticFrontEnd' "
-        "cannot find index of child '%s'",
-        name.AsCString());
+        "cannot find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -1233,8 +1233,8 @@ llvm::Expected<size_t> lldb_private::formatters::Foundation1100::
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSDictionaryMSyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 

lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp

@@ -133,8 +133,8 @@ class NSIndexPathSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
         (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
       return llvm::createStringError(
           "'SyntheticChildrenFrontEnd::NSIndexPathSyntheticFrontEnd' cannot "
-          "find index of child '%s'",
-          name.AsCString());
+          "find index of child '%s'. (idx='%d')",
+          name.AsCString(), idx);
     return idx;
   }
 

lldb/source/Plugins/Language/ObjC/NSSet.cpp

@@ -395,8 +395,8 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetIndexOfChildWithName(
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSSetISyntheticFrontEnd' cannot find "
-        "index of child '%s'",
-        name.AsCString());
+        "index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -532,8 +532,8 @@ lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetIndexOfChildWithName(
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::NSCFSetSyntheticFrontEnd' cannot find "
-        "index of child '%s'",
-        name.AsCString());
+        "index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 
@@ -670,8 +670,8 @@ llvm::Expected<size_t> lldb_private::formatters::GenericNSSetMSyntheticFrontEnd<
       (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::GenericNSSetMSyntheticFrontEnd' cannot "
-        "find index of child '%s'",
-        name.AsCString());
+        "find index of child '%s'. (idx='%d')",
+        name.AsCString(), idx);
   return idx;
 }
 

lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp

@@ -2042,21 +2042,21 @@ llvm::Expected<int> ScriptInterpreterPythonImpl::GetIndexOfChildWithName(
   if (!implementor_sp)
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::ScriptInterpreterPythonImpl' cannot find "
-        "index of child '%s'",
-        child_name);
+        "index of child '%s'. Invalid implementor (implementor_sp='%p').",
+        child_name, implementor_sp.get());
 
   StructuredData::Generic *generic = implementor_sp->GetAsGeneric();
   if (!generic)
     return llvm::createStringError(
-        "'SyntheticChildrenFrontEnd::ScriptInterpreterPythonImpl' cannot find "
-        "index of child '%s'",
-        child_name);
+        "'ScriptInterpreterPythonImpl' cannot find index of child '%s'. Could "
+        "not get generic from implementor  (generic='%p').",
+        child_name, generic);
   auto *implementor = static_cast<PyObject *>(generic->GetValue());
   if (!implementor)
     return llvm::createStringError(
-        "'SyntheticChildrenFrontEnd::ScriptInterpreterPythonImpl' cannot find "
-        "index of child '%s'",
-        child_name);
+        "'ScriptInterpreterPythonImpl' cannot find index of child '%s'. Could "
+        "not cast to PyObject (implementor='%p')",
+        child_name, implementor);
 
   int ret_val = INT32_MAX;
 
@@ -2069,8 +2069,7 @@ llvm::Expected<int> ScriptInterpreterPythonImpl::GetIndexOfChildWithName(
 
   if (ret_val == INT32_MAX)
     return llvm::createStringError(
-        "'SyntheticChildrenFrontEnd::ScriptInterpreterPythonImpl' cannot find "
-        "index of child '%s'",
+        "'ScriptInterpreterPythonImpl' cannot find index of child '%s'",
         child_name);
   return ret_val;
 }

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -7159,9 +7159,8 @@ TypeSystemClang::GetIndexOfChildWithName(lldb::opaque_compiler_type_t type,
       break;
     }
   }
-  return llvm::createStringError("'SyntheticChildrenFrontEnd::TypeSystemClang' "
-                                 "cannot find index of child '%s'",
-                                 name.str().c_str());
+  return llvm::createStringError(
+      "'TypeSystemClang' cannot find index of child '%s'", name.str().c_str());
 }
 
 CompilerType

lldb/source/Symbol/CompilerType.cpp

@@ -1031,9 +1031,8 @@ CompilerType::GetIndexOfChildWithName(llvm::StringRef name,
       return type_system_sp->GetIndexOfChildWithName(m_type, name,
                                                      omit_empty_base_classes);
   }
-  return llvm::createStringError("'SyntheticChildrenFrontEnd::CompilerType' "
-                                 "cannot find index of child '%s'",
-                                 name.str().c_str());
+  return llvm::createStringError(
+      "'CompilerType' cannot find index of child '%s'", name.str().c_str());
 }
 
 // Dumping types

lldb/source/ValueObject/ValueObjectRegister.cpp

@@ -147,8 +147,7 @@ ValueObjectRegisterSet::GetIndexOfChildWithName(llvm::StringRef name) {
       return reg_info->kinds[eRegisterKindLLDB];
   }
   return llvm::createStringError(
-      "'SyntheticChildrenFrontEnd::ValueObjectRegisterSet' cannot find index "
-      "of child '%s'",
+      "'ValueObjectRegisterSet' cannot find index of child '%s'",
       name.str().c_str());
 }
 

lldb/source/ValueObject/ValueObjectSyntheticFilter.cpp

@@ -350,13 +350,18 @@ ValueObjectSynthetic::GetIndexOfChildWithName(llvm::StringRef name_ref) {
     std::lock_guard<std::mutex> guard(m_child_mutex);
     m_name_toindex[name.GetCString()] = *index_or_err;
     return *index_or_err;
-  } else if (!found_index && m_synth_filter_up == nullptr)
+  } else if (!found_index && m_synth_filter_up == nullptr) {
     return llvm::createStringError(
         "'SyntheticChildrenFrontEnd::ValueObjectSynthetic' cannot find index "
-        "of child '%s'",
+        "of child '%s'. m_synth_filter_up is null.",
         name.AsCString());
-  else /*if (iter != m_name_toindex.end())*/
+  } else if (found_index) {
     return *found_index;
+  } else /*if (iter != m_name_toindex.end())*/
+    return llvm::createStringError(
+        "'SyntheticChildrenFrontEnd::ValueObjectSynthetic' cannot find index "
+        "of child '%s'",
+        name.AsCString());
 }
 
 bool ValueObjectSynthetic::IsInScope() { return m_parent->IsInScope(); }