Enable additional DWARFImporter tests.

Author: adrian-prantl

lldb/packages/Python/lldbsuite/test/lang/swift/dwarfimporter/C/TestSwiftDWARFImporterC.py

@@ -51,21 +51,56 @@ def test_dwarf_importer(self):
         lldbutil.check_variable(self,
                                 target.FindFirstGlobalVariable("point"),
                                 typename='__ObjC.Point', num_children=2)
-        self.expect("ta v point", substrs=["x = 1", "y = 2"])
-        self.expect("ta v enumerator", substrs=[".yellow"])
-        self.expect("ta v pureSwiftStruct", substrs=["pure swift"])
-        self.expect("ta v swiftStructCMember",
+        self.expect("target variable point", substrs=["x = 1", "y = 2"])
+        self.expect("target variable enumerator", substrs=[".yellow"])
+        self.expect("target variable pureSwiftStruct", substrs=["pure swift"])
+        self.expect("target variable swiftStructCMember",
                     substrs=["point", "x = 3", "y = 4",
                              "sub", "x = 1", "y = 2", "z = 3",
                              "swift struct c member"])
-        self.expect("ta v typedef", substrs=["x = 5", "y = 6"])
-        self.expect("ta v union", substrs=["(DoubleLongUnion)", "long_val = 42"])
-        self.expect("ta v fromSubmodule",
+        self.expect("target variable typedef", substrs=["x = 5", "y = 6"])
+        self.expect("target variable union",
+                    substrs=["(DoubleLongUnion)", "long_val = 42"])
+        self.expect("target variable fromSubmodule",
                     substrs=["(FromSubmodule)", "x = 1", "y = 2", "z = 3"])
         process.Clear()
         target.Clear()
         lldb.SBDebugger.MemoryPressureDetected()
 
+    @skipIf(archs=['ppc64le'], bugnumber='SR-10214')
+    @swiftTest
+    # This test needs a working Remote Mirrors implementation.
+    @skipIf(oslist=['linux', 'windows'])
+    def test_dwarf_importer_exprs(self):
+        lldb.SBDebugger.MemoryPressureDetected()
+        self.runCmd("settings set symbols.use-swift-dwarfimporter true")
+        self.build()
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'break here', lldb.SBFileSpec('main.swift'))
+        lldbutil.check_variable(self,
+                                target.FindFirstGlobalVariable("pureSwift"),
+                                value="42")
+        lldbutil.check_variable(self,
+                                target.FindFirstGlobalVariable("point"),
+                                typename='__ObjC.Point', num_children=2)
+        self.expect("expr point", substrs=["x = 1", "y = 2"])
+        self.expect("expr enumerator", substrs=[".yellow"])
+        self.expect("expr pureSwiftStruct", substrs=["pure swift"])
+        self.expect("expr swiftStructCMember",
+                    substrs=["point", "x = 3", "y = 4",
+                             "sub", "x = 1", "y = 2", "z = 3",
+                             "swift struct c member"])
+        self.expect("expr typedef", substrs=["x = 5", "y = 6"])
+        # FIXME: lookup fails for:
+        #   a.union.unsafeMutableAddressor : __C.DoubleLongUnion
+        self.expect("expr union", error=True)
+        #self.expect("expr union", substrs=["(DoubleLongUnion)", "long_val = 42"])
+        self.expect("expr fromSubmodule",
+                    substrs=["(FromSubmodule)", "x = 1", "y = 2", "z = 3"])
+        process.Clear()
+        target.Clear()
+        lldb.SBDebugger.MemoryPressureDetected()
+        
     @skipIf(archs=['ppc64le'], bugnumber='SR-10214')
     @swiftTest
     def test_negative(self):
@@ -81,7 +116,7 @@ def test_negative(self):
                                 target.FindFirstGlobalVariable("point"),
                                 typename="Point", num_children=2)
         # This works as a Clang type.
-        self.expect("ta v point", substrs=["x = 1", "y = 2"])
+        self.expect("target variable point", substrs=["x = 1", "y = 2"])
         # This can't be resolved.
         lldbutil.check_variable(self,
                                 target.FindFirstGlobalVariable("swiftStructCMember"),
@@ -97,4 +132,3 @@ def test_negative(self):
         process.Clear()
         target.Clear()
         lldb.SBDebugger.MemoryPressureDetected()
-        self.runCmd("settings set symbols.use-swift-dwarfimporter true")

lldb/packages/Python/lldbsuite/test/lang/swift/dwarfimporter/Objective-C/TestSwiftDWARFImporterObjC.py

@@ -37,7 +37,7 @@ def build(self):
 
     @skipUnlessDarwin
     @swiftTest
-    def test_dwarf_importer(self):
+    def test(self):
         self.runCmd("settings set symbols.use-swift-dwarfimporter true")
 
         self.build()
@@ -52,12 +52,32 @@ def test_dwarf_importer(self):
                                 num_children=0)
         self.expect("target var obj", substrs=["ObjCClass",
                                                "private_ivar", "42"])
-        # FIXME: This triggers an assertion in ClangImporter:
-        #        "ObjC property without getter"
-        #self.expect("target var swiftChild", substrs=["ObjCClass",
-        #                                              "private_ivar", "42"])
+
+        self.expect("target var swiftChild", substrs=["ObjCClass",
+                                                      "private_ivar", "42"])
         # This is a Clang type, since Clang doesn't generate DWARF for protocols.
         self.expect("target var -d no-dyn proto", substrs=["(id)", "proto"])
         # This is a Swift type.
         self.expect("target var -d run proto", substrs=["(ProtoImpl)", "proto"])
         self.expect("target var -O proto", substrs=["<ProtoImpl"])
+
+    @skipUnlessDarwin
+    @swiftTest
+    def test_expr(self):
+        self.runCmd("settings set symbols.use-swift-dwarfimporter true")
+
+        self.build()
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'break here', lldb.SBFileSpec('main.swift'))
+        lldbutil.check_variable(self,
+                                target.FindFirstGlobalVariable("pureSwift"),
+                                value="42")
+        lldbutil.check_variable(self,
+                                target.FindFirstGlobalVariable("obj"),
+                                typename="Swift.Optional<__ObjC.ObjCClass>",
+                                num_children=0)
+        self.expect("expr obj", substrs=["ObjCClass",
+                                         "private_ivar", "42"])
+        # FIXME: Removing this makes the expression below fail!
+        self.expect("target var swiftChild")
+        self.expect("expr swiftChild!.number", substrs=["42"])