Merge commit 'f18ed27ef0d8' from swift/release/5.9 into stable/20221013

Author: git apple-llvm automerger

lldb/test/API/lang/swift/regex/Makefile

@@ -1,5 +1,8 @@
-SWIFT_SOURCES := main.swift
-SWIFTFLAGS_EXTRAS := -Xfrontend -enable-bare-slash-regex -Xfrontend -disable-availability-checking
+ifeq "$(OS)" "Darwin"
+	OS_SWIFTFLAGS := -target $(ARCH)-apple-macosx13.0
+endif
 
+SWIFT_SOURCES := main.swift
+SWIFTFLAGS_EXTRAS := -enable-bare-slash-regex $(OS_SWIFTFLAGS)
 
 include Makefile.rules

lldb/test/API/lang/swift/regex/TestSwiftRegex.py

@@ -26,23 +26,54 @@ def setUp(self):
         self.main_source = "main.swift"
         self.main_source_spec = lldb.SBFileSpec(self.main_source)
 
-    @skipIf(bugnumber="rdar://106107613")
     @swiftTest
-    def test_swift_regex(self):
-        """Test Swift's regex support"""
+    @skipIf(macos_version=["<", "13"])
+    def test_swift_regex_frame_var(self):
+        """Test frame variable support for Swift regexes."""
         self.build()
         lldbutil.run_to_source_breakpoint(
             self, 'Set breakpoint here', self.main_source_spec)
         self.expect('v regex',
                     substrs=['_StringProcessing.Regex<(Substring, Substring, Substring, Substring)>) regex = {'])
-        self.expect('po regex',
-                    substrs=['Regex<(Substring, Substring, Substring, Substring)>'])
-
         self.expect('v dslRegex',
                     substrs=['(_StringProcessing.Regex<Substring>) dslRegex = {'])
-        self.expect('po dslRegex',
+
+    @swiftTest
+    @skipIf(macos_version=["<", "13"])
+    def test_swift_regex_expr_desc(self):
+        """Test expression object description support for Swift regexes."""
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', self.main_source_spec)
+        self.expect('expr -O -- regex',
+                    substrs=['Regex<(Substring, Substring, Substring, Substring)>'])
+        self.expect('expr -O -- dslRegex',
                     substrs=['Regex<Substring>'])
 
+    @swiftTest
+    @skipIf(macos_version=["<", "13"])
+    def test_swift_regex_frame_var_desc(self):
+        """Test frame variable object description support for Swift regexes."""
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', self.main_source_spec)
+        self.expect('vo regex',
+                    substrs=['Regex<(Substring, Substring, Substring, Substring)>'])
+        self.expect('vo dslRegex',
+                    substrs=['Regex<Substring>'])
+
+    @swiftTest
+    @skipIf(macos_version=["<", "13"])
+    def test_swift_regex_expr(self):
+        """Test expression support for Swift regexes."""
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', self.main_source_spec)
+        self.expect('expr regex',
+                    substrs=['_StringProcessing.Regex<(Substring, Substring, Substring, Substring)>) $R0 = {'])
+        self.expect('expr dslRegex',
+                    substrs=['(_StringProcessing.Regex<Substring>) $R1 = {'])
+
     @swiftTest
     @skipIf(macos_version=["<", "13"])
     def test_swift_regex_in_exp(self):