Auto merge of #96224 - Dylan-DPC:rollup-h2h3j93, r=Dylan-DPC

[rust.git] / library / std / src / alloc.rs

diff --git a/library/std/src/alloc.rs b/library/std/src/alloc.rs
index ae11964cb562803191d7def19b03c23024203217..49b6cd4232cd1792ae6ac046ab7530b052726b98 100644 (file)
--- a/library/std/src/alloc.rs
+++ b/library/std/src/alloc.rs
@@ -315,14 +315,11 @@ pub fn take_alloc_error_hook() -> fn(Layout) {
 }
 
 fn default_alloc_error_hook(layout: Layout) {
-    #[cfg(not(bootstrap))]
     extern "Rust" {
         // This symbol is emitted by rustc next to __rust_alloc_error_handler.
         // Its value depends on the -Zoom={panic,abort} compiler option.
         static __rust_alloc_error_handler_should_panic: u8;
     }
-    #[cfg(bootstrap)]
-    let __rust_alloc_error_handler_should_panic = 0;
 
     #[allow(unused_unsafe)]
     if unsafe { __rust_alloc_error_handler_should_panic != 0 } {