Merge commit '04bbe1bb0753' from swift/release/6.0 into stable/20230725

Author: git apple-llvm automerger

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

@@ -5,6 +5,7 @@
 
 # System modules
 import itertools
+import json
 import re
 import subprocess
 import sys
@@ -18,6 +19,7 @@
 from . import lldbtest_config
 import lldbsuite.test.lldbplatform as lldbplatform
 from lldbsuite.test.builders import get_builder
+from lldbsuite.test.lldbutil import is_exe
 
 
 def check_first_register_readable(test_case):
@@ -332,4 +334,26 @@ def expectedCompiler(compilers):
         if compiler in getCompiler():
             return True
 
+# This is a helper function to determine if a specific version of Xcode's linker
+# contains a TLS bug. We want to skip TLS tests if they contain this bug, but
+# adding a linker/linker_version conditions to a decorator is challenging due to
+# the number of ways linkers can enter the build process.
+def xcode15LinkerBug(_self=None):
+    """Returns true iff a test is running on a darwin platform and the host linker is between versions 1000 and 1109."""
+    darwin_platforms = lldbplatform.translate(lldbplatform.darwin_all)
+    if getPlatform() not in darwin_platforms:
+        return False
+
+    try:
+        raw_version_details = subprocess.check_output(
+            ("xcrun", "ld", "-version_details")
+        )
+        version_details = json.loads(raw_version_details)
+        version = version_details.get("version", "0")
+        version_tuple = tuple(int(x) for x in version.split("."))
+        if (1000,) <= version_tuple <= (1109,):
+            return True
+    except:
+        pass
+
     return False

lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py

@@ -42,7 +42,7 @@ def setUp(self):
         bugnumber="llvm.org/pr28392",
         oslist=no_match(lldbplatformutil.getDarwinOSTriples()),
     )
-    @expectedFailureDarwin("rdar://120676969")
+    @expectedFailureIfFn(lldbplatformutil.xcode15LinkerBug)
     def test(self):
         """Test thread-local storage."""
         self.build()

lldb/test/Shell/Unwind/eh-frame-dwarf-unwind.test

@@ -1,10 +1,8 @@
 # Test handing of dwarf expressions specifying the location of registers, if
 # those expressions refer to the frame's CFA value.
 
-# UNSUPPORTED: system-windows
+# UNSUPPORTED: system-windows, ld_new-bug
 # REQUIRES: target-x86_64, native
-# XFAIL: system-darwin
-# See: rdar://120797300
 
 # RUN: %clang_host %p/Inputs/call-asm.c %p/Inputs/eh-frame-dwarf-unwind.s -o %t
 # RUN: %lldb %t -s %s -o exit | FileCheck %s

lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test

@@ -2,9 +2,7 @@
 # points to non-executable memory.
 
 # REQUIRES: target-x86_64
-# UNSUPPORTED: system-windows
-# XFAIL: system-darwin
-# See: rdar://120797300
+# UNSUPPORTED: system-windows, ld_new-bug
 
 # RUN: %clang_host %p/Inputs/call-asm.c -x assembler-with-cpp %p/Inputs/thread-step-out-ret-addr-check.s -o %t
 # RUN: not %lldb %t -s %s -b 2>&1 | FileCheck %s

lldb/test/Shell/lit.cfg.py

@@ -1,5 +1,6 @@
 # -*- Python -*-
 
+import json
 import os
 import platform
 import re
@@ -194,3 +195,18 @@ def calculate_arch_features(arch_string):
 
 if "LD_PRELOAD" in os.environ:
     config.available_features.add("ld_preload-present")
+
+# Determine if a specific version of Xcode's linker contains a bug. We want to
+# skip affected tests if they contain this bug.
+if platform.system() == "Darwin":
+    try:
+        raw_version_details = subprocess.check_output(
+            ("xcrun", "ld", "-version_details")
+        )
+        version_details = json.loads(raw_version_details)
+        version = version_details.get("version", "0")
+        version_tuple = tuple(int(x) for x in version.split("."))
+        if (1000,) <= version_tuple <= (1109,):
+            config.available_features.add("ld_new-bug")
+    except:
+        pass