Merge pull request #3626 from apple/jdevlieghere/AppleSilicon

Fix and re-enable some tests on Apple Silicon

Author: JDevlieghere

lldb/packages/Python/lldbsuite/test/lldbtest.py

@@ -1297,7 +1297,8 @@ def getCPUInfo(self):
 
     def isAArch64(self):
         """Returns true if the architecture is AArch64."""
-        return self.getArchitecture().lower() == "aarch64"
+        arch = self.getArchitecture().lower()
+        return arch in ["aarch64", "arm64", "arm64e"]
 
     def isAArch64SVE(self):
         return self.isAArch64() and "sve" in self.getCPUInfo()

lldb/test/API/functionalities/return-value/TestReturnValue.py

@@ -22,9 +22,10 @@ def affected_by_pr44132(self):
         return (self.getArchitecture() in ["aarch64", "arm"] and
                 self.getPlatform() in ["freebsd", "linux"])
 
-    # ABIMacOSX_arm can't fetch simple values inside a structure
+    # ABIMacOSX_arm(64) can't fetch simple values inside a structure
     def affected_by_radar_34562999(self):
-        return (self.getArchitecture() == 'armv7' or self.getArchitecture() == 'armv7k') and self.platformIsDarwin()
+        arch = self.getArchitecture().lower()
+        return arch in ['arm64', 'arm64e', 'armv7', 'armv7k'] and self.platformIsDarwin()
 
     @expectedFailureAll(oslist=["freebsd"], archs=["i386"],
                         bugnumber="llvm.org/pr48376")

lldb/test/API/functionalities/tsan/swift-access-race/TestTsanSwiftAccessRace.py

@@ -30,7 +30,6 @@ class TsanSwiftAccessRaceTestCase(lldbtest.TestBase):
     @skipIfLinux
     @skipUnlessSwiftThreadSanitizer
     @skipIfAsan # This test does not behave reliable with an ASANified LLDB.
-    @expectedFailureAll(archs=['arm64'])
     def test_tsan_swift(self):
         self.build()
         self.do_test()

lldb/test/API/functionalities/tsan/swift/TestTsanSwift.py

@@ -29,7 +29,6 @@ class TsanSwiftTestCase(lldbtest.TestBase):
     @skipIfLinux
     @skipUnlessSwiftThreadSanitizer
     @skipIfAsan # This test does not behave reliable with an ASANified LLDB.
-    @expectedFailureAll(archs=['arm64'])
     def test_tsan_swift(self):
         self.build()
         self.do_test()

lldb/test/API/lang/swift/multi_optionals/TestMultiOptionals.py

@@ -12,6 +12,4 @@
 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
-lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest,
-                           expectedFailureAll(archs=['arm64', 'arm64e', 'arm64_32'], bugnumber="<rdar://problem/57854589>")])
-
+lldbinline.MakeInlineTest(__file__, globals(), decorators=[swiftTest])

lldb/test/API/macosx/macCatalyst/Makefile

@@ -1,6 +1,7 @@
 C_SOURCES := main.c
 
-CFLAGS_EXTRAS := -target $(ARCH)-apple-ios13.0-macabi
+override TRIPLE := $(ARCH)-apple-ios13.1-macabi
+CFLAGS_EXTRAS := -target $(TRIPLE)
 
 # FIXME: rdar://problem/54986190
 # There is a Clang driver change missing on llvm.org.