Merge pull request #10614 from adrian-prantl/cherry-pick-visitor

Cherry pick visitor

Author: adrian-prantl

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

@@ -667,16 +667,30 @@ GetExistentialSyntheticChildren(TypeSystemSwiftTypeRef &ts,
       llvm::dyn_cast<swift::reflection::ProtocolCompositionTypeRef>(tr);
   if (!protocol_composition_tr)
     return children;
-  if (ti && (llvm::isa<swift::reflection::ReferenceTypeInfo>(ti) ||
-             llvm::isa<swift::reflection::RecordTypeInfo>(ti))) {
+  if (!ti)
+    return children;
+  auto *rti = llvm::dyn_cast<swift::reflection::RecordTypeInfo>(ti);
+  if (rti || llvm::isa<swift::reflection::ReferenceTypeInfo>(ti)) {
     TypeSystemSwiftTypeRefSP ts_sp = ts.GetTypeSystemSwiftTypeRef();
     children.push_back({"object", [=]() {
                           if (auto *super_class_tr =
                                   protocol_composition_tr->getSuperclass())
                             return GetTypeFromTypeRef(*ts_sp, super_class_tr);
                           else
-                            return ts_sp->GetRawPointerType();
-    }});
+                            return rti ? ts_sp->GetBuiltinUnknownObjectType()
+                                       : ts_sp->GetBuiltinRawPointerType();
+                        }});
+    // We replaced "object" with a more specific type.
+    if (rti) {
+      auto &fields = rti->getFields();
+      for (unsigned i = 1; i < fields.size(); ++i) {
+        TypeSystemSwiftTypeRefSP ts_sp = ts.GetTypeSystemSwiftTypeRef();
+        auto *type_ref = fields[i].TR;
+        children.push_back({fields[i].Name, [=]() {
+                              return GetTypeFromTypeRef(*ts_sp, type_ref);
+                            }});
+      }
+    }
   }
   if (ti && llvm::isa<swift::reflection::RecordTypeInfo>(ti)) {
     auto &fields =

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -8623,10 +8623,6 @@ std::string SwiftASTContext::GetSwiftName(const clang::Decl *clang_decl,
   return {};
 }
 
-CompilerType SwiftASTContext::GetBuiltinRawPointerType() {
-  return GetTypeFromMangledTypename(ConstString("$sBpD"));
-}
-
 CompilerType
 SwiftASTContext::ConvertClangTypeToSwiftType(CompilerType clang_type) {
   auto ts = GetTypeSystemSwiftTypeRef();

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

@@ -412,7 +412,6 @@ class SwiftASTContext : public TypeSystemSwift {
   std::string GetSwiftName(const clang::Decl *clang_decl,
                            TypeSystemClang &clang_typesystem) override;
 
-  CompilerType GetBuiltinRawPointerType() override;
   CompilerType GetBuiltinIntType();
 
   /// Attempts to convert a Clang type into a Swift type.

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.cpp

@@ -98,6 +98,14 @@ bool TypeSystemSwift::IsScalarType(opaque_compiler_type_t type) {
   return (GetTypeInfo(type, nullptr) & eTypeIsScalar) != 0;
 }
 
+CompilerType TypeSystemSwift::GetBuiltinRawPointerType() {
+  return GetTypeFromMangledTypename(ConstString("$sBpD"));
+}
+
+CompilerType TypeSystemSwift::GetBuiltinUnknownObjectType() {
+  return GetTypeFromMangledTypename(ConstString("$sBOD"));
+}
+
 bool TypeSystemSwift::ShouldTreatScalarValueAsAddress(
     opaque_compiler_type_t type) {
   return Flags(GetTypeInfo(type, nullptr))

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h

@@ -197,7 +197,8 @@ class TypeSystemSwift : public TypeSystem {
   virtual std::string GetSwiftName(const clang::Decl *clang_decl,
                                    TypeSystemClang &clang_typesystem) = 0;
 
-  virtual CompilerType GetBuiltinRawPointerType() = 0;
+  CompilerType GetBuiltinRawPointerType();
+  CompilerType GetBuiltinUnknownObjectType();
 
   /// Attempts to convert a Clang type into a Swift type.
   /// For example, int is converted to Int32.

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1444,11 +1444,6 @@ TypeSystemSwiftTypeRef::GetSwiftName(const clang::Decl *clang_decl,
   return {};
 }
 
-CompilerType TypeSystemSwiftTypeRef::GetBuiltinRawPointerType() {
-  return GetTypeFromMangledTypename(ConstString("$sBpD"));
-}
-
-
 static bool IsImportedType(swift::Demangle::NodePointer node) {
   if (!node)
     return false;

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

@@ -412,8 +412,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
   std::string GetSwiftName(const clang::Decl *clang_decl,
                            TypeSystemClang &clang_typesystem) override;
 
-  CompilerType GetBuiltinRawPointerType() override;
-
   /// Wrap \p node as \p Global(TypeMangling(node)), remangle the type
   /// and create a CompilerType from it.
   CompilerType RemangleAsType(swift::Demangle::Demangler &dem,

lldb/test/API/lang/swift/unknown_reference/TestSwiftUnknownReference.py

@@ -21,7 +21,7 @@ class TestSwiftUnknownReference(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
     def check_class(self, var_self):
-        lldbutil.check_variable(self, var_self, num_children=2)
+        lldbutil.check_variable(self, var_self, use_dynamic=True, num_children=2)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         lldbutil.check_variable(self, m_base_string, summary='"hello"')

lldb/test/API/lang/swift/unknown_self/TestSwiftUnknownSelf.py

@@ -20,7 +20,9 @@ class TestSwiftUnknownSelf(lldbtest.TestBase):
 
     def check_class(self, var_self, weak):
         self.expect("v self", substrs=["hello", "world"])
-        lldbutil.check_variable(self, var_self, num_children=2)
+        # FIXME: This is inconsistent. If self is Optional, an extra
+        #        indirection is needed.
+        lldbutil.check_variable(self, var_self, num_children=2 if weak else 1)
         m_base_string = var_self.GetChildMemberWithName("base_string")
         m_string = var_self.GetChildMemberWithName("string")
         # FIXME: This is inconsistent. If self is Optional, an extra