Merge pull request #5940 from augusto2112/1013-test-gen-params

[lldb] Add more test cases to TestSwiftNestedGenericClass

Author: augusto2112

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

@@ -1644,8 +1644,13 @@ bool SwiftLanguageRuntimeImpl::GetDynamicTypeAndAddress_Class(
   Log *log(GetLog(LLDBLog::Types));
   auto *reflection_ctx = GetReflectionContext();
   const auto *typeref = reflection_ctx->readTypeFromInstance(instance_ptr);
-  if (!typeref)
+  if (!typeref) {
+    if (log) {
+      log->Printf("could not read typeref for type: %s\n",
+                  class_type.GetMangledTypeName().GetCString());
+    }
     return false;
+  }
   swift::Demangle::Demangler dem;
   swift::Demangle::NodePointer node = typeref->getDemangling(dem);
   class_type_or_name.SetCompilerType(ts.RemangleAsType(dem, node));

lldb/test/API/lang/swift/nested_generic_class/TestSwiftNestedGenericClass.py

@@ -5,12 +5,26 @@
 import unittest2
 
 
-class SwiftNestedGenericClassTest(TestBase):
+class TestSwiftNestedGenericClass(TestBase):
 
     @swiftTest
     def test(self):
         """Tests that a generic class type nested inside another generic class can be resolved correctly from the instance metadata"""
         self.build()
-        lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.swift"))
-        self.expect("v foo", substrs=["a.A<Int>.B<String>"])
+        _, process, _, breakpoint = lldbutil.run_to_source_breakpoint(self, 
+                                "break here", lldb.SBFileSpec("main.swift"))
+        self.expect("v self", substrs=["A<Int>.B<String>"])
+
+        lldbutil.continue_to_breakpoint(process, breakpoint)
+        self.expect("v self", substrs=["C.D<Double>"])
+
+        lldbutil.continue_to_breakpoint(process, breakpoint)
+        self.expect("v self", substrs=["F.G<Bool>.H"])
+
+        lldbutil.continue_to_breakpoint(process, breakpoint)
+        self.expect("v self", substrs=["I.J<String, Int>"])
+
+        
+        lldbutil.continue_to_breakpoint(process, breakpoint)
+        self.expect("v self", substrs=["K.L.M<Double, Bool>"])
 

lldb/test/API/lang/swift/nested_generic_class/main.swift

@@ -1,7 +1,49 @@
 public class A<T> {
   public class B<U> {
+    func f() {
+        print(1) // break here
+    }
   }
 }
 
-let foo = A<Int>.B<String>()
-print(1) // break here
+class C {
+  class D<T> {
+    func f() {
+      print(1) // break here
+    }
+  }
+}
+
+class F {
+  class G<T> {
+    class H {
+      func f() {
+        print(1) // break here
+      }
+    }
+  }
+}
+
+class I {
+  class J<T, U> {
+    func f() {
+      print(1) // break here
+    }
+  }
+}
+
+class K {
+  class L {
+    class M<T, U> {
+      func f() {
+        print(1) // break here
+      }
+    }
+  }
+}
+
+A<Int>.B<String>().f()
+C.D<Double>().f()
+F.G<Bool>.H().f()
+I.J<String, Int>().f()
+K.L.M<Double, Bool>().f()