Merge pull request #6824 from adrian-prantl/6814

Support clang structs with void* fields

Author: adrian-prantl

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

@@ -751,13 +751,10 @@ SwiftLanguageRuntimeImpl::emplaceClangTypeInfo(
   // The stride is the size rounded up to alignment.
   const size_t byte_stride = llvm::alignTo(*byte_size, byte_align);
   unsigned extra_inhabitants = 0;
-  if (clang_type.IsPointerType(nullptr)) {
-    lldb_assert(TypeSystemSwiftTypeRef::IsKnownSpecialImportedType(
-                    clang_type.GetDisplayTypeName().GetStringRef()),
-                "Expected clang pointer type to be a known special type!",
-              __FUNCTION__, __FILE__, __LINE__);
+  if (clang_type.IsPointerType() &&
+      TypeSystemSwiftTypeRef::IsKnownSpecialImportedType(
+          clang_type.GetDisplayTypeName().GetStringRef()))
     extra_inhabitants = swift::swift_getHeapObjectExtraInhabitantCount();
-  }
 
   if (fields.empty()) {
     auto it_b = m_clang_type_info.insert(
@@ -1432,7 +1429,7 @@ CompilerType SwiftLanguageRuntimeImpl::GetChildCompilerTypeAtIndex(
     auto fields = rti->getFields();
 
     // Handle tuples.
-    if (idx > rti->getNumFields())
+    if (idx >= rti->getNumFields())
       LLDB_LOGF(GetLog(LLDBLog::Types), "index %zu is out of bounds (%d)", idx,
                 rti->getNumFields());
     llvm::Optional<TypeSystemSwift::TupleElement> tuple;

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

@@ -298,8 +298,26 @@ TypeSystemSwiftTypeRef::GetClangTypeNode(CompilerType clang_type,
   llvm::StringRef swift_name;
   llvm::StringRef module_name = swift::MANGLING_MODULE_OBJC;
   CompilerType pointee;
-  if (clang_type.IsPointerType(&pointee))
+  if (clang_type.IsPointerType(&pointee)) {
     clang_type = pointee;
+    if (clang_type.IsVoidType()) {
+      // Sugar (void *) as "UnsafeMutableRawPointer?".
+      NodePointer optional = dem.createNode(Node::Kind::SugaredOptional);
+      NodePointer type = dem.createNode(Node::Kind::Type);
+      NodePointer module = dem.createNodeWithAllocatedText(Node::Kind::Module,
+                                                           swift::STDLIB_NAME);
+      NodePointer identifier = dem.createNodeWithAllocatedText(
+          Node::Kind::Identifier, clang_type.IsConst()
+                                      ? "UnsafeRawPointer"
+                                      : "UnsafeMutableRawPointer");
+      NodePointer nominal = dem.createNode(kind);
+      nominal->addChild(module, dem);
+      nominal->addChild(identifier, dem);
+      type->addChild(nominal, dem);
+      optional->addChild(type, dem);
+      return optional;
+    }
+  }
   llvm::StringRef clang_name = clang_type.GetTypeName().GetStringRef();
 #define MAP_TYPE(C_TYPE_NAME, C_TYPE_KIND, C_TYPE_BITWIDTH, SWIFT_MODULE_NAME, \
                  SWIFT_TYPE_NAME, CAN_BE_MISSING, C_NAME_MAPPING)              \

lldb/test/API/lang/swift/dwarfimporter/C/Inputs/c-header.h

@@ -12,3 +12,8 @@ union DoubleLongUnion {
   double double_val;
   long long_val;
 };
+
+struct WithPointer {
+  void *ptr;
+  const void *const_ptr;
+};

lldb/test/API/lang/swift/dwarfimporter/C/TestSwiftDWARFImporterC.py

@@ -61,6 +61,8 @@ def test_dwarf_importer(self):
         #            substrs=["(DoubleLongUnion)", "long_val = 42"])
         self.expect("target variable fromSubmodule",
                     substrs=["(FromSubmodule)", "x = 1", "y = 2", "z = 3"])
+        self.expect("target variable withPointer",
+                    substrs=["(WithPointer)", "ptr = nil"])
 
     @skipIf(archs=['ppc64le'], bugnumber='SR-10214')
     @swiftTest

lldb/test/API/lang/swift/dwarfimporter/C/main.swift

@@ -22,6 +22,8 @@ let swiftStructCMember = SwiftStructCMember()
 let typedef = TPoint(x: 5, y: 6)
 let union = DoubleLongUnion(long_val: 42)
 let fromSubmodule = FromSubmodule(x: 1, y: 2, z: 3)
+let withPointer = WithPointer(ptr: UnsafeMutableRawPointer(bitPattern: 0x0),
+                        const_ptr: UnsafeMutableRawPointer(bitPattern: 0x0))
 
 use(pureSwift) // break here
 use(point)
@@ -31,3 +33,4 @@ use(swiftStructCMember)
 use(typedef)
 use(union)
 use(fromSubmodule)
+use(withPointer)