fixup! upgrade Swift plugin to use llvm::Expected for GetIndexOfChildWithName

Author: charles-zablit

lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp

@@ -635,14 +635,13 @@ class URLComponentsSyntheticChildrenFrontEnd
       m_synth_frontend_up->Update();
 
 #define COMPONENT(Name, PrettyName, ID)                                        \
-  auto index_or_err =                                                          \
-      synthetic_children->GetIndexOfChildWithName(s_FuncPtr_name);             \
+  auto index_or_err = m_synth_frontend_up->GetIndexOfChildWithName(g__##Name); \
   if (!index_or_err) {                                                         \
     LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters), index_or_err.takeError(),  \
                    "{0}");                                                     \
     return ChildCacheState::eRefetch;                                          \
   }                                                                            \
-  m_##Name = m_synth_frontend_up->GetChildAtIndex(index_or_err).get();         \
+  m_##Name = m_synth_frontend_up->GetChildAtIndex(*index_or_err).get();        \
   if (m_##Name)                                                                \
     m_##Name->SetName(GetNameFor##Name());
 #include "URLComponents.def"

lldb/source/Plugins/Language/Swift/SwiftArray.cpp

@@ -515,8 +515,7 @@ llvm::Expected<size_t> lldb_private::formatters::swift::ArraySyntheticFrontEnd::
                                    name.AsCString());
   const char *item_name = name.GetCString();
   uint32_t idx = ExtractIndexFromString(item_name);
-  if ((idx == UINT32_MAX) ||
-      (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
+  if (idx == UINT32_MAX || idx >= CalculateNumChildrenIgnoringErrors())
     return llvm::createStringError("Type has no child named '%s'",
                                    name.AsCString());
   return idx;

lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp

@@ -1536,7 +1536,10 @@ lldb_private::formatters::swift::EnumSyntheticFrontEnd::Update() {
   m_exe_ctx_ref = m_backend.GetExecutionContextRef();
   m_element_name.SetCString(m_backend.GetValueAsCString());
   auto index_or_err = m_backend.GetIndexOfChildWithName(m_element_name);
-  m_child_index = !index_or_err : UINT32_MAX : *index_or_err;
+  if (!index_or_err)
+    llvm::consumeError(index_or_err.takeError());
+  else
+    m_child_index = *index_or_err;
   return ChildCacheState::eRefetch;
 }
 

lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp

@@ -738,8 +738,7 @@ HashedSyntheticChildrenFrontEnd::GetIndexOfChildWithName(ConstString name) {
                                    name.AsCString());
   const char *item_name = name.GetCString();
   uint32_t idx = ExtractIndexFromString(item_name);
-  if ((idx == UINT32_MAX) ||
-      (idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
+  if (idx == UINT32_MAX || idx >= CalculateNumChildrenIgnoringErrors())
     return llvm::createStringError("Type has no child named '%s'",
                                    name.AsCString());
   return idx;