Merge commit '536c7d8e6ef9' from swift/release/5.3 into swift/master

Author: git apple-llvm automerger

lldb/test/API/lang/swift/macCatalyst/Makefile

@@ -0,0 +1,5 @@
+SWIFT_SOURCES := main.swift
+
+TRIPLE := x86_64-apple-ios13.0-macabi
+
+include Makefile.rules

lldb/test/API/lang/swift/macCatalyst/TestSwiftMacCatalyst.py

@@ -0,0 +1,63 @@
+import lldb
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbutil as lldbutil
+import os
+import unittest2
+
+
+class TestSwiftMacCatalyst(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    # There's a bug that prevents the maccatalyst SDK overlays from being built.
+    @expectedFailureAll(bugnumber='rdar://problem/62658576')
+    @swiftTest
+    @skipIf(macos_version=["<", "10.15"])
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded
+    def test_macCatalyst(self):
+        """Test the x86_64-apple-ios-macabi target.
+           Note that this test only works when build-script
+           is being invoked with --maccatalyst!
+        """
+        self.build()
+
+        types_log = self.getBuildArtifact('types.log')
+        self.runCmd('log enable lldb types -f "%s"' % types_log)
+
+        lldbutil.run_to_source_breakpoint(self, "break here",
+                                          lldb.SBFileSpec('main.swift'))
+        self.expect("image list -t -b",
+                    patterns=["x86_64-apple-ios13.0.0-macabi a\.out",
+                              "x86_64.*-apple-ios.*-macabi Foundation",
+                              "x86_64.*-apple-.* libswiftCore",
+                              "x86_64.*-apple-macosx.* libcompiler_rt.dylib"])
+        self.expect("fr v s", "Hello macCatalyst")
+        expr_log = self.getBuildArtifact("expr.log")
+        self.expect('log enable lldb expr -f "%s"' % expr_log)
+        self.expect("p s", "Hello macCatalyst")
+        expr_logfile = open(expr_log, "r")
+        import re
+        availability_re = re.compile(r'@available\(macCatalyst 1.*, \*\)')
+        found = False
+        for line in expr_logfile:
+            print(line)
+            if availability_re.search(line):
+               found = True
+               break
+        self.assertTrue(found)
+
+        found_prebuilt = False
+        found_sdk = False
+        types_logfile = open(types_log, "r")
+        for line in types_logfile:
+            if 'Using prebuilt Swift module cache path: ' in line:
+                self.assertTrue(line.endswith('/macosx/prebuilt-modules\n'),
+                                'unexpected prebuilt cache path: ' + line)
+                found = True
+            if 'SDK path' in line:
+                self.assertTrue('SDKs/MacOSX' in line, 'picked non-macOS SDK:' + line)
+                found_sdk = True
+        self.assertTrue(found_prebuilt, 'prebuilt cache path log entry not found')
+        self.assertTrue(found_sdk, 'SDK path log entry not found')

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

@@ -0,0 +1,5 @@
+func use<T>(_ t: T) {}
+
+import Foundation
+let s = NSString(string: "Hello MacABI")
+use(s) // break here