[lldb] Pass descriptor finder to computeUnalignedFieldStartOffset

augusto2112 · bnbarham · commit b8ed493b7613 · 2024-06-07T14:48:47.000-07:00
rdar://128141491
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/ReflectionContext.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/ReflectionContext.cpp
@@ -169,7 +169,7 @@ class TargetReflectionContext : public ReflectionContextInterface {
       return nullptr;
 
     auto start =
-        m_reflection_ctx.computeUnalignedFieldStartOffset(type_ref);
+        m_reflection_ctx.computeUnalignedFieldStartOffset(type_ref, provider);
     if (!start) {
       if (auto *log = GetLog(LLDBLog::Types)) {
         std::stringstream ss;
diff --git a/lldb/test/API/lang/swift/c_type_ivar/Foo/Foo.h b/lldb/test/API/lang/swift/c_type_ivar/Foo/Foo.h
@@ -0,0 +1,2 @@
+// Simulates the CoreFoundation CF_BRIDGED_TYPE(id) macro.
+typedef struct  __attribute__((objc_bridge(id))) {} *BridgedPtr;
diff --git a/lldb/test/API/lang/swift/c_type_ivar/Foo/module.modulemap b/lldb/test/API/lang/swift/c_type_ivar/Foo/module.modulemap
@@ -0,0 +1,3 @@
+module Foo {
+  header "Foo.h"
+}
diff --git a/lldb/test/API/lang/swift/c_type_ivar/Makefile b/lldb/test/API/lang/swift/c_type_ivar/Makefile
@@ -0,0 +1,4 @@
+SWIFT_OBJC_INTEROP := 1
+SWIFT_SOURCES := main.swift
+SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR)/Foo
+include Makefile.rules
diff --git a/lldb/test/API/lang/swift/c_type_ivar/TestSwiftCTypeIvar.py b/lldb/test/API/lang/swift/c_type_ivar/TestSwiftCTypeIvar.py
@@ -0,0 +1,36 @@
+import lldb
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbutil as lldbutil
+import unittest2
+
+
+class TestSwiftCTypeIvar(TestBase):
+    @swiftTest
+    @skipIf(setting=("symbols.use-swift-clangimporter", "false"))
+    def test(self):
+        """Test that the extra inhabitants are correctly computed for various
+        kinds of Objective-C pointers, by using them in enums."""
+        self.build()
+        # Disable SwiftASTContext because we want to test we resolve the type
+        # by looking up the clang type in debug info.
+        self.runCmd("settings set symbols.swift-enable-ast-context false")
+        lldbutil.run_to_source_breakpoint(
+            self, "break here", lldb.SBFileSpec("main.swift")
+        )
+        # self.expect('v a', substrs=['asdf'])
+        a = self.frame().FindVariable("a")
+        lldbutil.check_variable(
+            self,
+            a.GetChildAtIndex(0),
+            typename="Swift.Optional<Foo.BridgedPtr>",
+            value="none",
+        )
+
+        b = self.frame().FindVariable("b")
+        lldbutil.check_variable(
+            self,
+            a.GetChildAtIndex(0),
+            typename="Swift.Optional<Foo.BridgedPtr>",
+            value="none",
+        )
diff --git a/lldb/test/API/lang/swift/c_type_ivar/main.swift b/lldb/test/API/lang/swift/c_type_ivar/main.swift
@@ -0,0 +1,18 @@
+import Foo
+
+class A {
+  let bridged : BridgedPtr? = nil
+}
+
+class B : A {}
+
+func use<T>(_ t: T) {}
+
+func main() {
+  let a = A()
+  let b = B()
+  use(a)
+  use(b) // break here
+}
+
+main()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Simulates the CoreFoundation CF_BRIDGED_TYPE(id) macro.`
	`2`	`+typedef struct __attribute__((objc_bridge(id))) {} *BridgedPtr;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module Foo {`
	`2`	`+ header "Foo.h"`
	`3`	`+}`