From 554a1aa0ba702d4a438ccd291d882ea3a3d27cd8 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sat, 14 Sep 2019 12:49:23 +0200 Subject: [PATCH] Reenable debug assertions for libstd on macOS m4b/faerie#91 has been merged --- build_sysroot/Cargo.toml | 6 ------ example/mini_core_hello_world.rs | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml index 24feabb2226c..f28a46245e8c 100644 --- a/build_sysroot/Cargo.toml +++ b/build_sysroot/Cargo.toml @@ -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-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] debug = true -debug-assertions = false diff --git a/example/mini_core_hello_world.rs b/example/mini_core_hello_world.rs index 5d65dd4d94f5..18362ee036b9 100644 --- a/example/mini_core_hello_world.rs +++ b/example/mini_core_hello_world.rs @@ -137,11 +137,7 @@ fn main() { let slice = &[0, 1] as &[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 - // assertion to fail. - if cfg!(not(target_os = "macos")) { - assert_eq!(slice_ptr as usize % 4, 0); - } + assert_eq!(slice_ptr as usize % 4, 0); //return;