[lldb] Support direct ivar access in Swift

Author: kastiglione

lldb/source/Plugins/Language/Swift/SwiftLanguage.h

@@ -18,6 +18,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Target/Language.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/lldb-private.h"
 
 namespace lldb_private {
@@ -88,6 +89,8 @@ class SwiftLanguage : public Language {
 
   bool SymbolNameFitsToLanguage(Mangled mangled) const override;
 
+  ConstString GetInstanceVariableName() override { return ConstString("self"); }
+
   //------------------------------------------------------------------
   // PluginInterface protocol
   //------------------------------------------------------------------

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h

@@ -19,6 +19,7 @@
 #include "lldb/Symbol/TypeSystem.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Flags.h"
+#include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-private.h"
 
 namespace clang {
@@ -198,13 +199,12 @@ class TypeSystemSwift : public TypeSystem {
   ConstString DeclContextGetScopeQualifiedName(void *opaque_decl_ctx) override {
     return {};
   }
-  bool
-  DeclContextIsClassMethod(void *opaque_decl_ctx,
-                           lldb::LanguageType *language_ptr,
-                           bool *is_instance_method_ptr,
-                           ConstString *language_object_name_ptr) override {
+  bool DeclContextIsClassMethod(void *opaque_decl_ctx) override {
     return false;
   }
+  lldb::LanguageType DeclContextGetLanguage(void *) override {
+    return lldb::eLanguageTypeSwift;
+  }
   bool IsRuntimeGeneratedType(lldb::opaque_compiler_type_t type) override {
     return false;
   }

lldb/test/API/commands/frame/var/direct-ivar/swift/Makefile

@@ -0,0 +1,2 @@
+SWIFT_SOURCES := main.swift
+include Makefile.rules

lldb/test/API/commands/frame/var/direct-ivar/swift/TestFrameVarDirectIvarSwift.py

@@ -0,0 +1,19 @@
+import lldb
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+from lldbsuite.test import lldbutil
+
+
+class TestCase(TestBase):
+    @skipUnlessDarwin
+    def test_objc_self(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(self, "check self", lldb.SBFileSpec("main.swift"))
+        self.expect("frame variable _prop", startstr="(Int) _prop = 30")
+
+    @skipUnlessDarwin
+    def test_objc_self_capture_idiom(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(self, "check idiomatic self", lldb.SBFileSpec("main.swift"))
+        self.expect("frame variable self", startstr="(a.Classic) self = 0x")
+        self.expect("frame variable _prop", startstr="(Int) _prop = 30")

lldb/test/API/commands/frame/var/direct-ivar/swift/main.swift

@@ -0,0 +1,22 @@
+class Classic {
+  var _prop = 30
+
+  func fun() {
+    print("check self")
+  }
+
+  func run() {
+    { [weak self] in
+      guard let self else { fatalError("cannot happen") }
+      print("check idiomatic self")
+      self.fun()
+    }()
+  }
+}
+
+func main() {
+  var c = Classic()
+  c.run()
+}
+
+main()

lldb/test/API/lang/swift/archetype_in_expression/TestArchetypeInExpression.py

@@ -22,18 +22,18 @@ def test(self):
         self.expect("e U.self", substrs=["[Int].Type"])
         # Assert that frame variable doesn't work
         self.expect("v First.self", 
-                substrs=["no variable named 'First' found in this frame"], 
+                substrs=["no variable or instance variable named 'First' found in this frame"],
                 error=True)
         self.expect("v T.self", 
-                substrs=["no variable named 'T' found in this frame"], 
+                substrs=["no variable or instance variable named 'T' found in this frame"],
                 error=True)
 
         # Check that referring to a shadowed archetype works correctly.
         lldbutil.continue_to_breakpoint(process, breakpoint)
         self.expect("e T.self", substrs=["String.Type"])
         # Assert that frame variable doesn't work
         self.expect("v T.self", 
-                substrs=["no variable named 'T' found in this frame"], 
+                substrs=["no variable or instance variable named 'T' found in this frame"],
                 error=True)
 
         # Check that you refer to archetypes in nested generic functions.