bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reenable debug assertions for libstd on macOS

Browse source 
m4b/faerie#91 has been merged
This commit is contained in:
bjorn3 2019-09-14 12:49:23 +02:00
parent 8f12b87542
commit 554a1aa0ba
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build_sysroot/Cargo.toml
View file

@ -17,11 +17,5 @@ rustc-std-workspace-core = { path = "./sysroot_src/src/tools/rustc-std-workspace
rustc-std-workspace-alloc = { path = "./sysroot_src/src/tools/rustc-std-workspace-alloc" } rustc-std-workspace-alloc = { path = "./sysroot_src/src/tools/rustc-std-workspace-alloc" }
rustc-std-workspace-std = { path = "./sysroot_src/src/tools/rustc-std-workspace-std" } rustc-std-workspace-std = { path = "./sysroot_src/src/tools/rustc-std-workspace-std" }
[profile.dev]
# FIXME On macOS statics and promoted constants have the wrong alignment. This causes a debug
# assertion in `copy_nonoverlapping` to panic.
debug-assertions = false
[profile.release] [profile.release]
debug = true debug = true
debug-assertions = false

6
example/mini_core_hello_world.rs
View file

@ -137,11 +137,7 @@ fn main() {
let slice = &[0, 1] as &[i32]; let slice = &[0, 1] as &[i32];
let slice_ptr = slice as *const [i32] as *const i32; let slice_ptr = slice as *const [i32] as *const i32;
// FIXME On macOS statics and promoted constants have the wrong alignment. This causes this assert_eq!(slice_ptr as usize % 4, 0);
// assertion to fail.
if cfg!(not(target_os = "macos")) {
assert_eq!(slice_ptr as usize % 4, 0);
}
//return; //return;