Make more of the test suite run on Mac Catalyst

library/std/src/fs/tests.rs

@@ -1431,7 +1431,7 @@ fn metadata_access_times() {
  assert_eq!(check!(a.modified()), check!(a.modified()));
  assert_eq!(check!(b.accessed()), check!(b.modified()));
 
- if cfg!(target_os = "macos") || cfg!(target_os = "windows") {
+ if cfg!(target_vendor = "apple") || cfg!(target_os = "windows") {
  check!(a.created());
  check!(b.created());
  }

library/std/src/sys/pal/unix/stack_overflow.rs

@@ -491,6 +491,14 @@ mod imp {
  }
 }
 
+// This is intentionally not enabled on iOS/tvOS/watchOS/visionOS, as it uses
+// several symbols that might lead to rejections from the App Store, namely
+// `sigaction`, `sigaltstack`, `sysctlbyname`, `mmap`, `munmap` and `mprotect`.
+//
+// This might be overly cautious, though it is also what Swift does (and they
+// usually have fewer qualms about forwards compatibility, since the runtime
+// is shipped with the OS):
+// <https:/apple/swift/blob/swift-5.10-RELEASE/stdlib/public/runtime/CrashHandlerMacOS.cpp>
 #[cfg(not(any(
  target_os = "linux",
  target_os = "freebsd",

src/bootstrap/src/utils/dylib.rs

@@ -5,7 +5,7 @@
 pub fn dylib_path_var() -> &'static str {
  if cfg!(target_os = "windows") {
  "PATH"
- } else if cfg!(target_os = "macos") {
+ } else if cfg!(target_vendor = "apple") {
  "DYLD_LIBRARY_PATH"
  } else if cfg!(target_os = "haiku") {
  "LIBRARY_PATH"

src/tools/compiletest/src/header.rs

@@ -747,6 +747,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
  "ignore-aarch64",
  "ignore-aarch64-unknown-linux-gnu",
  "ignore-android",
+ "ignore-apple",
  "ignore-arm",
  "ignore-avr",
  "ignore-beta",
@@ -829,7 +830,6 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
  "ignore-x32",
  "ignore-x86",
  "ignore-x86_64",
- "ignore-x86_64-apple-darwin",
  "ignore-x86_64-unknown-linux-gnu",
  "incremental",
  "known-bug",
@@ -876,6 +876,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
  "only-32bit",
  "only-64bit",
  "only-aarch64",
+ "only-apple",
  "only-arm",
  "only-avr",
  "only-beta",

src/tools/compiletest/src/header/cfg.rs

@@ -159,6 +159,12 @@ pub(super) fn parse_cfg_name_directive<'a>(
  message: "when the architecture is part of the Thumb family"
  }
 
+ condition! {
+ name: "apple",
+ condition: config.target.contains("apple"),
+ message: "when the target vendor is Apple"
+ }
+
  // Technically the locally built compiler uses the "dev" channel rather than the "nightly"
  // channel, even though most people don't know or won't care about it. To avoid confusion, we
  // treat the "dev" channel as the "nightly" channel when processing the directive.

src/tools/compiletest/src/runtest.rs

@@ -98,7 +98,7 @@ fn get_lib_name(lib: &str, aux_type: AuxType) -> Option<String> {
  AuxType::Lib => Some(format!("lib{}.rlib", lib)),
  AuxType::Dylib => Some(if cfg!(windows) {
  format!("{}.dll", lib)
- } else if cfg!(target_os = "macos") {
+ } else if cfg!(target_vendor = "apple") {
  format!("lib{}.dylib", lib)
  } else {
  format!("lib{}.so", lib)

src/tools/compiletest/src/util.rs

@@ -57,7 +57,7 @@ impl PathBufExt for PathBuf {
 pub fn dylib_env_var() -> &'static str {
  if cfg!(windows) {
  "PATH"
- } else if cfg!(target_os = "macos") {
+ } else if cfg!(target_vendor = "apple") {
  "DYLD_LIBRARY_PATH"
  } else if cfg!(target_os = "haiku") {
  "LIBRARY_PATH"

src/tools/tidy/src/issues.txt

@@ -2122,7 +2122,6 @@ ui/issues/issue-33687.rs
 ui/issues/issue-33770.rs
 ui/issues/issue-3389.rs
 ui/issues/issue-33941.rs
-ui/issues/issue-33992.rs
 ui/issues/issue-34047.rs
 ui/issues/issue-34074.rs
 ui/issues/issue-34209.rs

src/tools/tidy/src/ui_tests.rs

@@ -15,7 +15,7 @@ use std::path::{Path, PathBuf};
 const ENTRY_LIMIT: u32 = 900;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: u32 = 1676;
+const ISSUES_ENTRY_LIMIT: u32 = 1674;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
  "rs", // test source files

tests/assembly/stack-protector/stack-protector-heuristics-effect.rs

@@ -1,6 +1,6 @@
 //@ revisions: all strong basic none missing
 //@ assembly-output: emit-asm
-//@ ignore-macos slightly different policy on stack protection of arrays
+//@ ignore-apple slightly different policy on stack protection of arrays
 //@ ignore-msvc stack check code uses different function names
 //@ ignore-nvptx64 stack protector is not supported
 //@ ignore-wasm32-bare
@@ -17,12 +17,9 @@
 // See comments on https:/rust-lang/rust/issues/114903.
 
 #![crate_type = "lib"]
-
 #![allow(incomplete_features)]
-
 #![feature(unsized_locals, unsized_fn_params)]
 
-
 // CHECK-LABEL: emptyfn:
 #[no_mangle]
 pub fn emptyfn() {

tests/assembly/x86_64-array-pair-load-store-merge.rs

@@ -2,7 +2,7 @@
 //@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel
 //@ only-x86_64
 //@ ignore-sgx
-//@ ignore-macos (manipulates rsp too)
+//@ ignore-apple (manipulates rsp too)
 
 // Depending on various codegen choices, this might end up copying
 // a `<2 x i8>`, an `i16`, or two `i8`s.

tests/assembly/x86_64-function-return.rs

@@ -9,7 +9,7 @@
 //@ [keep-thunk-extern] compile-flags: -Zfunction-return=keep -Zfunction-return=thunk-extern
 //@ [thunk-extern-keep] compile-flags: -Zfunction-return=thunk-extern -Zfunction-return=keep
 //@ only-x86_64
-//@ ignore-x86_64-apple-darwin Symbol is called `___x86_return_thunk` (Darwin's extra underscore)
+//@ ignore-apple Symbol is called `___x86_return_thunk` (Darwin's extra underscore)
 //@ ignore-sgx Tests incompatible with LVI mitigations
 
 #![crate_type = "lib"]

tests/codegen/gdb_debug_script_load.rs

@@ -1,6 +1,6 @@
 //
 //@ ignore-windows
-//@ ignore-macos
+//@ ignore-apple
 //@ ignore-wasm
 //@ ignore-emscripten
 

tests/codegen/instrument-coverage/testprog.rs

@@ -11,7 +11,7 @@
 //@ [LINUX] filecheck-flags: -DINSTR_PROF_COVFUN=__llvm_covfun
 //@ [LINUX] filecheck-flags: '-DCOMDAT_IF_SUPPORTED=, comdat'
 
-//@ [DARWIN] only-macos
+//@ [DARWIN] only-apple
 //@ [DARWIN] filecheck-flags: -DINSTR_PROF_DATA=__DATA,__llvm_prf_data,regular,live_support
 //@ [DARWIN] filecheck-flags: -DINSTR_PROF_NAME=__DATA,__llvm_prf_names
 //@ [DARWIN] filecheck-flags: -DINSTR_PROF_CNTS=__DATA,__llvm_prf_cnts
@@ -49,7 +49,7 @@ where
 
 pub fn wrap_with<F, T>(inner: T, should_wrap: bool, wrapper: F)
 where
- F: FnOnce(&T)
+ F: FnOnce(&T),
 {
  if should_wrap {
  wrapper(&inner)

tests/codegen/issues/issue-44056-macos-tls-align.rs

@@ -1,5 +1,5 @@
 //
-//@ only-macos
+//@ only-apple
 //@ compile-flags: -O
 
 #![crate_type = "rlib"]

tests/codegen/mainsubprogram.rs

@@ -2,13 +2,12 @@
 // before 4.0, formerly backported to the Rust LLVM fork.
 
 //@ ignore-windows
-//@ ignore-macos
+//@ ignore-apple
 //@ ignore-wasi
 
 //@ compile-flags: -g -C no-prepopulate-passes
 
 // CHECK-LABEL: @main
 // CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DI{{(SP)?}}FlagMainSubprogram{{.*}}
 
-pub fn main() {
-}
+pub fn main() {}

tests/codegen/mainsubprogramstart.rs

@@ -1,5 +1,5 @@
 //@ ignore-windows
-//@ ignore-macos
+//@ ignore-apple
 //@ ignore-wasi wasi codegens the main symbol differently
 
 //@ compile-flags: -g -C no-prepopulate-passes

tests/codegen/pgo-counter-bias.rs

@@ -1,6 +1,6 @@
 // Test that __llvm_profile_counter_bias does not get internalized by lto.
 
-//@ ignore-macos -runtime-counter-relocation not honored on Mach-O
+//@ ignore-apple -runtime-counter-relocation not honored on Mach-O
 //@ compile-flags: -Cprofile-generate -Cllvm-args=-runtime-counter-relocation -Clto=fat
 //@ needs-profiler-support
 //@ no-prefer-dynamic

tests/run-make/c-dynamic-dylib/Makefile

@@ -4,7 +4,7 @@
 # ignore-cross-compile
 include ../tools.mk
 
-# ignore-macos
+# ignore-apple
 #
 # This hits an assertion in the linker on older versions of osx apparently
 

tests/run-make/c-dynamic-rlib/Makefile

@@ -4,7 +4,7 @@
 # ignore-cross-compile
 include ../tools.mk
 
-# ignore-macos
+# ignore-apple
 #
 # This hits an assertion in the linker on older versions of osx apparently
 

tests/run-make/emit-stack-sizes/Makefile

@@ -1,10 +1,10 @@
 include ../tools.mk
 
 # ignore-windows
-# ignore-macos
+# ignore-apple
 #
 # This feature only works when the output object format is ELF so we ignore
-# macOS and Windows
+# Apple and Windows
 
 # check that the .stack_sizes section is generated
 all:

tests/run-make/fpic/Makefile

@@ -2,7 +2,7 @@
 include ../tools.mk
 
 # ignore-windows
-# ignore-macos
+# ignore-apple
 
 # Test for #39529.
 # `-z text` causes ld to error if there are any non-PIC sections

tests/run-make/link-framework/Makefile

@@ -1,4 +1,4 @@
-# only-macos
+# only-apple
 #
 # Check that linking to a framework actually makes it to the linker.
 

tests/run-make/macos-fat-archive/Makefile

@@ -1,4 +1,4 @@
-# only-macos
+# only-apple
 
 include ../tools.mk
 

tests/run-make/native-link-modifier-verbatim-linker/Makefile

@@ -1,5 +1,5 @@
 # ignore-cross-compile
-# ignore-macos
+# ignore-apple
 
 include ../tools.mk
 

tests/run-make/used-cdylib-macos/Makefile

@@ -1,9 +1,9 @@
 include ../tools.mk
 
-# only-macos
+# only-apple
 #
 # This checks that `#[used]` passes through to the linker on
-# darwin. This is subject to change in the future, see
+# Apple targets. This is subject to change in the future, see
 # https:/rust-lang/rust/pull/93718 for discussion
 
 all:

tests/run-pass-valgrind/exit-flushes.rs

@@ -1,6 +1,6 @@
 //@ ignore-wasm32 no subprocess support
 //@ ignore-sgx no processes
-//@ ignore-macos this needs valgrind 3.11 or higher; see
+//@ ignore-apple this needs valgrind 3.11 or higher; see
 // https:/rust-lang/rust/pull/30365#issuecomment-165763679
 
 use std::env;
@@ -11,8 +11,7 @@ fn main() {
  print!("hello!");
  exit(0);
  } else {
- let out = Command::new(env::args().next().unwrap()).arg("foo")
- .output().unwrap();
+ let out = Command::new(env::args().next().unwrap()).arg("foo").output().unwrap();
  assert!(out.status.success());
  assert_eq!(String::from_utf8(out.stdout).unwrap(), "hello!");
  assert_eq!(String::from_utf8(out.stderr).unwrap(), "");

tests/ui/abi/stack-probes-lto.rs

@@ -10,5 +10,9 @@
 //@ compile-flags: -C lto
 //@ no-prefer-dynamic
 //@ ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino
+//@ ignore-ios Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-tvos Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-watchos Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-visionos Stack probes are enabled, but the SIGSEGV handler isn't
 
 include!("stack-probes.rs");

tests/ui/abi/stack-probes.rs

@@ -8,6 +8,10 @@
 //@ ignore-sgx no processes
 //@ ignore-fuchsia no exception handler registered for segfault
 //@ ignore-nto Crash analysis impossible at SIGSEGV in QNX Neutrino
+//@ ignore-ios Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-tvos Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-watchos Stack probes are enabled, but the SIGSEGV handler isn't
+//@ ignore-visionos Stack probes are enabled, but the SIGSEGV handler isn't
 
 use std::env;
 use std::mem::MaybeUninit;

tests/ui/backtrace/apple-no-dsymutil.rs

@@ -2,7 +2,7 @@
 
 //@ compile-flags:-Cstrip=none
 //@ compile-flags:-g -Csplit-debuginfo=unpacked
-//@ only-macos
+//@ only-apple
 
 use std::process::Command;
 use std::str;

tests/ui/deployment-target/macos-target.rs

@@ -1,4 +1,4 @@
-//@ only-macos
+//@ only-apple
 //@ compile-flags: --print deployment-target
 //@ normalize-stdout-test: "\d+\." -> "$$CURRENT_MAJOR_VERSION."
 //@ normalize-stdout-test: "\d+" -> "$$CURRENT_MINOR_VERSION"

tests/ui/intrinsics/intrinsic-alignment.rs

@@ -10,20 +10,21 @@ mod rusti {
  }
 }
 
-#[cfg(any(target_os = "android",
- target_os = "dragonfly",
- target_os = "emscripten",
- target_os = "freebsd",
- target_os = "fuchsia",
- target_os = "hurd",
- target_os = "illumos",
- target_os = "linux",
- target_os = "macos",
- target_os = "netbsd",
- target_os = "openbsd",
- target_os = "solaris",
- target_os = "vxworks",
- target_os = "nto",
+#[cfg(any(
+ target_os = "android",
+ target_os = "dragonfly",
+ target_os = "emscripten",
+ target_os = "freebsd",
+ target_os = "fuchsia",
+ target_os = "hurd",
+ target_os = "illumos",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd",
+ target_os = "solaris",
+ target_os = "vxworks",
+ target_os = "nto",
+ target_vendor = "apple",
 ))]
 mod m {
  #[cfg(target_arch = "x86")]

tests/ui/issues/issue-45731.rs

@@ -2,19 +2,24 @@
 #![allow(unused_variables)]
 //@ compile-flags:--test -g
 
-#[cfg(target_os = "macos")]
+#[cfg(target_vendor = "apple")]
 #[test]
 fn simple_test() {
- use std::{env, panic, fs};
+ use std::{env, fs, panic};
 
  // Find our dSYM and replace the DWARF binary with an empty file
  let mut dsym_path = env::current_exe().unwrap();
  let executable_name = dsym_path.file_name().unwrap().to_str().unwrap().to_string();
  assert!(dsym_path.pop()); // Pop executable
  dsym_path.push(format!("{}.dSYM/Contents/Resources/DWARF/{0}", executable_name));
  {
- let file = fs::OpenOptions::new().read(false).write(true).truncate(true).create(false)
- .open(&dsym_path).unwrap();
+ let file = fs::OpenOptions::new()
+ .read(false)
+ .write(true)
+ .truncate(true)
+ .create(false)
+ .open(&dsym_path)
+ .unwrap();
  }
 
  env::set_var("RUST_BACKTRACE", "1");