[compiler-rt] [sanitizer_common] [Darwin] OS/feature detection should use the run-wrapper (PR #171167)

[Andrew Haberlandt via llvm-commits]

https://github.com/ndrewh created https://github.com/llvm/llvm-project/pull/171167

Some Darwin test configurations use a `%run` [wrapper](https://github.com/llvm/llvm-project/blob/fd140048b36d8ec81a865e2f2bf67e5c1a0e2e6e/compiler-rt/test/lit.common.cfg.py#L409). We should also use this wrapper when doing OS detection and feature detection.

>From 7f13799d3f9cfd0a575680a8f3e451ab844ef0f0 Mon Sep 17 00:00:00 2001
From: Andrew Haberlandt <ahaberlandt at apple.com>
Date: Mon, 8 Dec 2025 09:51:33 -0800
Subject: [PATCH] [sanitizer_common] [Darwin] OS/feature detection should use
 the run-wrapper on Darwin

---
 compiler-rt/test/builtins/lit.cfg.py |  6 ++---
 compiler-rt/test/lit.common.cfg.py   | 39 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/compiler-rt/test/builtins/lit.cfg.py b/compiler-rt/test/builtins/lit.cfg.py
index 6491f4735b9e6..44c36212ee3fd 100644
--- a/compiler-rt/test/builtins/lit.cfg.py
+++ b/compiler-rt/test/builtins/lit.cfg.py
@@ -23,11 +23,11 @@
 
 if config.target_os == "Darwin":
     config.substitutions.append(
-        ("%macos_version_major", str(config.darwin_osx_version[0]))
+        ("%macos_version_major", str(config.darwin_os_version[0]))
     )
     config.substitutions.append(
-        ("%macos_version_minor", str(config.darwin_osx_version[1]))
+        ("%macos_version_minor", str(config.darwin_os_version[1]))
     )
     config.substitutions.append(
-        ("%macos_version_subminor", str(config.darwin_osx_version[2]))
+        ("%macos_version_subminor", str(config.darwin_os_version[2]))
     )
diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index 7ff4d34153454..e3a9ed4501194 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -452,6 +452,7 @@ def get_ios_commands_dir():
     # the work.
     config.substitutions.append(("%device_rm", "{} rm ".format(run_wrapper)))
     config.compile_wrapper = compile_wrapper
+    config.darwin_run_wrapper = run_wrapper
 
     try:
         prepare_output = (
@@ -491,6 +492,7 @@ def get_ios_commands_dir():
     # When running locally %device_rm is a no-op.
     config.substitutions.append(("%device_rm", "echo "))
     config.compile_wrapper = ""
+    config.darwin_run_wrapper = ""
 
 # Define CHECK-%os to check for OS-dependent output.
 config.substitutions.append(("CHECK-%os", ("CHECK-" + config.target_os)))
@@ -561,27 +563,30 @@ def get_ios_commands_dir():
 )
 
 if config.target_os == "Darwin":
-    osx_version = (10, 0, 0)
-    try:
-        osx_version = subprocess.check_output(
-            ["sw_vers", "-productVersion"], universal_newlines=True
-        )
-        osx_version = tuple(int(x) for x in osx_version.split("."))
-        if len(osx_version) == 2:
-            osx_version = (osx_version[0], osx_version[1], 0)
-        if osx_version >= (10, 11):
-            config.available_features.add("osx-autointerception")
-            config.available_features.add("osx-ld64-live_support")
-        if osx_version >= (13, 1):
-            config.available_features.add("jit-compatible-osx-swift-runtime")
-    except subprocess.CalledProcessError:
-        pass
+    if config.darwin_run_wrapper != "" and not config.apple_platform.endswith("sim"):
+        os_detection_prefix = [config.darwin_run_wrapper]
+    else:
+        # There is no simulator-specific sw_vers/sysctl, so we use the host OS version
+        os_detection_prefix = []
+
+    darwin_os_version = subprocess.check_output(
+        os_detection_prefix + ["sw_vers", "-productVersion"], universal_newlines=True
+    )
+    darwin_os_version = tuple(int(x) for x in darwin_os_version.split("."))
+
+    if len(darwin_os_version) == 2:
+        darwin_os_version = (darwin_os_version[0], darwin_os_version[1], 0)
+    if darwin_os_version >= (10, 11):
+        config.available_features.add("osx-autointerception")
+        config.available_features.add("osx-ld64-live_support")
+    if darwin_os_version >= (13, 1):
+        config.available_features.add("jit-compatible-osx-swift-runtime")
 
-    config.darwin_osx_version = osx_version
+    config.darwin_os_version = darwin_os_version
 
     # Detect x86_64h
     try:
-        output = subprocess.check_output(["sysctl", "hw.cpusubtype"])
+        output = subprocess.check_output(os_detection_prefix + ["sysctl", "hw.cpusubtype"])
         output_re = re.match("^hw.cpusubtype: ([0-9]+)$", output)
         if output_re:
             cpu_subtype = int(output_re.group(1))