Merge pull request #6405 from augusto2112/test-typedef-interop

[lldb] Add Swift/C++ test for C++ typedefs, C++ using, and Swift type…

Author: augusto2112

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

@@ -3156,7 +3156,9 @@ TypeSystemSwiftTypeRef::ShouldPrintAsOneLiner(opaque_compiler_type_t type,
                                               ValueObject *valobj) {
   auto impl = [&]() {
     if (type) {
-      if (IsImportedType(type, nullptr))
+      auto canonical = GetCanonicalType(type);
+      if (canonical)
+        if (IsImportedType(canonical.GetOpaqueQualType(), nullptr))
         return eLazyBoolNo;
     }
     if (valobj) {

lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/Makefile

@@ -0,0 +1,4 @@
+SWIFT_SOURCES := main.swift
+SWIFT_CXX_INTEROP := 1
+SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR) 
+include Makefile.rules

lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/TestTypedefType.py

@@ -0,0 +1,25 @@
+
+"""
+Test that printing C++ types with typedefs, using, and Swift typealiases print correctly in Swift
+"""
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+
+
+class TestTypedefType(TestBase):
+
+    @swiftTest
+    def test_class(self):
+        self.build()
+        self.runCmd('setting set target.experimental.swift-enable-cxx-interop true')
+        _, _, _, _= lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
+
+        self.expect('v typedef', substrs=['TypedefedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
+        self.expect('expr typedef', substrs=['TypedefedCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
+
+        self.expect('v using', substrs=['UsingCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
+        self.expect('expr using', substrs=['UsingCxxClass', 'a1', '10', 'a2', '20', 'a3', '30'])
+
+        self.expect('v typealiased', substrs=['TypeAliased', 'a1', '10', 'a2', '20', 'a3', '30'])
+        self.expect('expr typealiased', substrs=['TypeAliased', 'a1', '10', 'a2', '20', 'a3', '30'])

lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/main.swift

@@ -0,0 +1,11 @@
+import ReturnsClass
+
+typealias TypeAliased = CxxClass
+
+func main() {
+  let typedef = TypedefedCxxClass()
+  let using = UsingCxxClass()
+  let typealiased = TypeAliased()
+  print(1) // Set breakpoint here
+}
+main()

lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/module.modulemap

@@ -0,0 +1,4 @@
+module ReturnsClass {
+  header "returns-class.h"
+  requires cplusplus
+}

lldb/test/API/lang/swift/cxx_interop/forward/typedefed-type/returns-class.h

@@ -0,0 +1,10 @@
+
+struct CxxClass {
+  long long a1 = 10;
+  long long a2 = 20;
+  long long a3 = 30;
+};
+
+
+typedef CxxClass TypedefedCxxClass;
+using UsingCxxClass = CxxClass;