[lldb] Remove an obsolete wrapper class (NFC)

Author: adrian-prantl

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

@@ -40,7 +40,7 @@ std::string lldb_private::formatters::swift::SwiftOptionalSummaryProvider::
 
 // if this ValueObject is an Optional<T> with the Some(T) case selected,
 // retrieve the value of the Some case..
-static PointerOrSP
+static ValueObjectSP
 ExtractSomeIfAny(ValueObject *optional,
                  bool synthetic_value = false) {
   if (!optional)
@@ -58,8 +58,8 @@ ExtractSomeIfAny(ValueObject *optional,
   if (!value || value == g_None)
     return nullptr;
 
-  PointerOrSP value_sp(
-      non_synth_valobj->GetChildMemberWithName(g_Some, true).get());
+  ValueObjectSP value_sp(
+      non_synth_valobj->GetChildMemberWithName(g_Some, true));
   if (!value_sp)
     return nullptr;
 
@@ -86,7 +86,7 @@ ExtractSomeIfAny(ValueObject *optional,
           DataExtractor extractor(buffer_sp, process_sp->GetByteOrder(),
                                   process_sp->GetAddressByteSize());
           ExecutionContext exe_ctx(process_sp);
-          value_sp = PointerOrSP(ValueObject::CreateValueObjectFromData(
+          value_sp = ValueObjectSP(ValueObject::CreateValueObjectFromData(
               value_sp->GetName().AsCString(), extractor, exe_ctx, value_type));
           if (!value_sp)
             return nullptr;
@@ -116,12 +116,12 @@ ExtractSomeIfAny(ValueObject *optional,
     value_sp = value_sp->GetSyntheticValue();
 
   return value_sp;
-  }
+}
 
 static bool
 SwiftOptional_SummaryProvider_Impl(ValueObject &valobj, Stream &stream,
                                    const TypeSummaryOptions &options) {
-  PointerOrSP some = ExtractSomeIfAny(&valobj, true);
+  ValueObjectSP some = ExtractSomeIfAny(&valobj, true);
   if (!some) {
     stream.Printf("nil");
     return true;
@@ -145,7 +145,7 @@ SwiftOptional_SummaryProvider_Impl(ValueObject &valobj, Stream &stream,
         .SetSkipReferences(false);
     StringSummaryFormat oneliner(oneliner_flags, "");
     std::string buffer;
-    oneliner.FormatObject(some, buffer, options);
+    oneliner.FormatObject(some.get(), buffer, options);
     stream.Printf("%s", buffer.c_str());
   }
 
@@ -172,7 +172,7 @@ bool lldb_private::formatters::swift::SwiftOptionalSummaryProvider::
   if (!target_valobj)
     return false;
 
-  PointerOrSP some = ExtractSomeIfAny(target_valobj, true);
+  ValueObjectSP some = ExtractSomeIfAny(target_valobj, true);
 
   if (!some)
     return true;
@@ -191,7 +191,7 @@ bool lldb_private::formatters::swift::SwiftOptionalSummaryProvider::
       return false;
     return some->HasChildren();
   }
-  return some->HasChildren() && summary_sp->DoesPrintChildren(some);
+  return some->HasChildren() && summary_sp->DoesPrintChildren(some.get());
 }
 
 bool lldb_private::formatters::swift::SwiftOptionalSummaryProvider::

lldb/source/Plugins/Language/Swift/SwiftOptional.h

@@ -22,42 +22,6 @@
 
 namespace lldb_private {
 namespace formatters {
-// ExtractSomeIfAny() can return EITHER a child member or some other long-lived
-// ValueObject
-// OR an entirely consed-up ValueObject
-// The lifetime of these two is radically different, and there is no trivial way
-// to do the right
-// thing for both cases - except have a class that can wrap either and is safe
-// to store and pass around
-class PointerOrSP {
-public:
-  PointerOrSP(std::nullptr_t) : m_raw_ptr(nullptr), m_shared_ptr(nullptr) {}
-
-  PointerOrSP(ValueObject *valobj) : m_raw_ptr(valobj), m_shared_ptr(nullptr) {}
-
-  PointerOrSP(lldb::ValueObjectSP valobj_sp)
-      : m_raw_ptr(nullptr), m_shared_ptr(valobj_sp) {}
-
-  ValueObject *operator->() {
-    if (m_shared_ptr)
-      return m_shared_ptr.get();
-    return m_raw_ptr;
-  }
-
-  ValueObject &operator*() { return *(this->operator->()); }
-
-  operator ValueObject *() { return this->operator->(); }
-
-  explicit operator bool() const {
-    return (m_shared_ptr.get() != nullptr) || (m_raw_ptr != nullptr);
-  }
-
-  bool operator==(std::nullptr_t) const { return !(this->operator bool()); }
-
-protected:
-  ValueObject *m_raw_ptr;
-  lldb::ValueObjectSP m_shared_ptr;
-};
 
 namespace swift {
 struct SwiftOptionalSummaryProvider : public TypeSummaryImpl {
@@ -92,7 +56,7 @@ class SwiftOptionalSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
 private:
   bool m_is_none;
   bool m_children;
-  PointerOrSP m_some;
+  lldb::ValueObjectSP m_some;
 
   bool IsEmpty() const;
 };

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -866,6 +866,10 @@ SwiftLanguageRuntime::GetNumFields(CompilerType type,
       return rti->getNumFields();
     }
   }
+  case TypeInfoKind::Builtin: {
+    // Clang types without debug info may present themselves like this.
+    return {};
+  }
   case TypeInfoKind::Enum: {
     auto *eti = llvm::cast<EnumTypeInfo>(ti);
     return eti->getNumPayloadCases();