[lldb][swift] Fix GetParentIfClosure for static methods of classes

felipepiovezan · felipepiovezan · commit a2b816dd4cf6 · 2025-06-27T07:08:32.000-07:00
These use the Static mangled node, which we were not handling.
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeNames.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeNames.cpp
@@ -1513,7 +1513,7 @@ std::string SwiftLanguageRuntime::GetParentNameIfClosure(StringRef name) {
                                      Kind::ExplicitClosure};
   static const auto function_kinds = {Kind::ImplicitClosure,
                                       Kind::ExplicitClosure, Kind::Function,
-                                      Kind::Constructor};
+                                      Kind::Constructor, Kind::Static};
   auto *closure_node = swift_demangle::GetFirstChildOfKind(node, closure_kinds);
   auto *parent_func_node =
       swift_demangle::GetFirstChildOfKind(closure_node, function_kinds);
diff --git a/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py b/lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py
@@ -110,6 +110,27 @@ def test_async_closure(self):
     def test_ctor_class_closure(self):
         self.build()
         (target, process, thread) = self.get_to_bkpt("break_ctor_class")
-        check_not_captured_error(self, thread.frames[0], "input", "MY_STRUCT.init(input:)")
-        check_not_captured_error(self, thread.frames[0], "find_me", "MY_STRUCT.init(input:)")
+        check_not_captured_error(
+            self, thread.frames[0], "input", "MY_STRUCT.init(input:)"
+        )
+        check_not_captured_error(
+            self, thread.frames[0], "find_me", "MY_STRUCT.init(input:)"
+        )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me")
+
+        lldbutil.continue_to_source_breakpoint(
+            self, process, "break_static_member", lldb.SBFileSpec("main.swift")
+        )
+        check_not_captured_error(
+            self,
+            thread.frames[0],
+            "input_static",
+            "static MY_STRUCT.static_func(input_static:)",
+        )
+        check_not_captured_error(
+            self,
+            thread.frames[0],
+            "find_me_static",
+            "static MY_STRUCT.static_func(input_static:)",
+        )
+        check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me_static")
diff --git a/lldb/test/API/lang/swift/closures_var_not_captured/main.swift b/lldb/test/API/lang/swift/closures_var_not_captured/main.swift
@@ -95,9 +95,18 @@ class MY_STRUCT {
     }
     let dont_find_me = "hello"
   }
+
+  static func static_func(input_static: [Int]) {
+    let find_me_static = "hello"
+    let _ = input_static.map {
+      return $0  // break_static_member
+    }
+    let dont_find_me_static = "hello"
+  }
 }
 
 func_1(arg: 42)
 func_2(arg: 42)
 await func_3(arg: 42)
 let _ = MY_STRUCT(input: [1, 2])
+MY_STRUCT.static_func(input_static: [42])

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,18 @@ class MY_STRUCT {`
`95`	`95`	`}`
`96`	`96`	`let dont_find_me = "hello"`
`97`	`97`	`}`
	`98`	`+`
	`99`	`+ static func static_func(input_static: [Int]) {`
	`100`	`+ let find_me_static = "hello"`
	`101`	`+ let _ = input_static.map {`
	`102`	`+ return $0 // break_static_member`
	`103`	`+ }`
	`104`	`+ let dont_find_me_static = "hello"`
	`105`	`+ }`
`98`	`106`	`}`
`99`	`107`
`100`	`108`	`func_1(arg: 42)`
`101`	`109`	`func_2(arg: 42)`
`102`	`110`	`await func_3(arg: 42)`
`103`	`111`	`let _ = MY_STRUCT(input: [1, 2])`
	`112`	`+MY_STRUCT.static_func(input_static: [42])`