Skip to content

Commit f957826

Browse files
committed
Auto merge of #146513 - madsmtm:apple-reenable-assertions, r=Mark-Simulacrum
Re-enable assertions on macOS alt builds These were previously disabled, in part for performance reasons, in part due to needing availability symbols `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast` that `compiler-builtins` did not provide, see #62592 (comment) and #134275 (comment) for failed checks. Since #138944 though, `std` now provides these symbols, so we should be able to re-enable LLVM assertions, debug assertions and overflow checks. Fixes #59637. try-job: `*apple*`
2 parents c8905ea + 9878be7 commit f957826

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,6 @@ auto:
431431
MACOSX_DEPLOYMENT_TARGET: 10.12
432432
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
433433
SELECT_XCODE: /Applications/Xcode_15.2.app
434-
NO_LLVM_ASSERTIONS: 1
435-
NO_DEBUG_ASSERTIONS: 1
436-
NO_OVERFLOW_CHECKS: 1
437434
DIST_REQUIRE_ALL_TOOLS: 1
438435
CODEGEN_BACKENDS: llvm,cranelift
439436
<<: *job-macos
@@ -449,9 +446,6 @@ auto:
449446
MACOSX_DEPLOYMENT_TARGET: 10.12
450447
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
451448
SELECT_XCODE: /Applications/Xcode_15.2.app
452-
NO_LLVM_ASSERTIONS: 1
453-
NO_DEBUG_ASSERTIONS: 1
454-
NO_OVERFLOW_CHECKS: 1
455449
<<: *job-macos
456450

457451
- name: dist-aarch64-apple
@@ -471,9 +465,6 @@ auto:
471465
# supports the hardware.
472466
MACOSX_DEPLOYMENT_TARGET: 11.0
473467
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
474-
NO_LLVM_ASSERTIONS: 1
475-
NO_DEBUG_ASSERTIONS: 1
476-
NO_OVERFLOW_CHECKS: 1
477468
DIST_REQUIRE_ALL_TOOLS: 1
478469
CODEGEN_BACKENDS: llvm,cranelift
479470
<<: *job-macos
@@ -493,9 +484,6 @@ auto:
493484
# supports the hardware, so only need to test it there.
494485
MACOSX_DEPLOYMENT_TARGET: 11.0
495486
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
496-
NO_LLVM_ASSERTIONS: 1
497-
NO_DEBUG_ASSERTIONS: 1
498-
NO_OVERFLOW_CHECKS: 1
499487
<<: *job-macos
500488

501489
######################

tests/crashes/120175.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ known-bug: #120175
22
//@ needs-rustc-debug-assertions
3+
//@ ignore-apple (raw-dylib doesn't work on Apple targets yet)
34

45
#![feature(extern_types)]
56
#![feature(raw_dylib_elf)]

0 commit comments

Comments
 (0)