Merge commit 'b7d164a11b8a' from swift/release/6.2.1 into swift/release/6.2

git apple-llvm automerger · git apple-llvm automerger · commit d759b6f8928d · 2025-09-24T10:04:04.000-07:00
diff --git a/lldb/test/API/lang/swift/other_arch_dylib/Makefile b/lldb/test/API/lang/swift/other_arch_dylib/Makefile
@@ -15,7 +15,7 @@ OtherArch.framework/Versions/A/OtherArch: $(SRCDIR)/OtherArch.swift
 		FRAMEWORK=OtherArch \
 		FRAMEWORK_MODULES=OtherArch.swiftinterface \
 		FRAMEWORK_HEADERS=OtherArch.h \
-		SWIFTFLAGS_EXTRAS="-target arm64e-apple-macos12" \
+		SWIFTFLAGS_EXTRAS="-target arm64e-apple-macos15" \
 		SDKROOT=$(shell xcrun --sdk macosx.internal --show-sdk-path)
 	rm -f $(BUILDDIR)/OtherArch.swiftmodule $(BUILDDIR)/OtherArch.swiftinterface
 	rm -f OtherArch.o OtherArch.h OtherArch.partial.swiftmodule
diff --git a/lldb/test/API/lang/swift/other_arch_dylib/OtherArch.swift b/lldb/test/API/lang/swift/other_arch_dylib/OtherArch.swift
@@ -1,3 +1,2 @@
-public func foo() {
-  print("break here")
+public func foo() { // break here
 }
diff --git a/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py b/lldb/test/API/lang/swift/other_arch_dylib/TestSwiftOtherArchDylib.py
@@ -33,6 +33,5 @@ def test(self):
 
         # Check the types log.
         self.filecheck('platform shell cat "%s"' % types_log, __file__)
-        # CHECK: SwiftASTContextForExpressions::LogConfiguration() arm64-apple-macosx
-        # CHECK: Enabling per-module Swift scratch context
-        # CHECK: {{SwiftASTContextForExpressions..OtherArch..}}::LogConfiguration() arm64e-apple-macosx
+        # CHECK: SwiftASTContextForExpressions(module: "OtherArch", cu: "OtherArch.swift")::LogConfiguration(){{.*}}arm64e-apple-macos
+        # CHECK: SwiftASTContextForExpressions(module: "arm64-apple-macos{{.*}})::LogConfiguration(){{.*}}arm64-apple-macos

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-public func foo() {`
`2`		`- print("break here")`
	`1`	`+public func foo() { // break here`
`3`	`2`	`}`