Merge commit 'fc9cdb24c81e' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

lldb/test/API/lang/swift/closures_var_not_captured/TestSwiftClosureVarNotCaptured.py

@@ -111,26 +111,26 @@ 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:)"
+            self, thread.frames[0], "input", "MY_CLASS.init(input:)"
         )
         check_not_captured_error(
-            self, thread.frames[0], "find_me", "MY_STRUCT.init(input:)"
+            self, thread.frames[0], "find_me", "MY_CLASS.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")
+            self, process, "break_static_member_class", lldb.SBFileSpec("main.swift")
         )
         check_not_captured_error(
             self,
             thread.frames[0],
             "input_static",
-            "static MY_STRUCT.static_func(input_static:)",
+            "static MY_CLASS.static_func(input_static:)",
         )
         check_not_captured_error(
             self,
             thread.frames[0],
             "find_me_static",
-            "static MY_STRUCT.static_func(input_static:)",
+            "static MY_CLASS.static_func(input_static:)",
         )
         check_no_enhanced_diagnostic(self, thread.frames[0], "dont_find_me_static")

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

@@ -87,7 +87,7 @@ func func_3(arg: Int) async {
   print(dont_find_me)
 }
 
-class MY_STRUCT {
+class MY_CLASS {
   init(input: [Int]) {
     let find_me = "hello"
     let _ = input.map {
@@ -99,7 +99,7 @@ class MY_STRUCT {
   static func static_func(input_static: [Int]) {
     let find_me_static = "hello"
     let _ = input_static.map {
-      return $0  // break_static_member
+      return $0  // break_static_member_class
     }
     let dont_find_me_static = "hello"
   }
@@ -108,5 +108,5 @@ class MY_STRUCT {
 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])
+let _ = MY_CLASS(input: [1, 2])
+MY_CLASS.static_func(input_static: [42])