about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-27 11:32:39 +0000
committerbors <bors@rust-lang.org>2016-12-27 11:32:39 +0000
commitd849b132672d4c7824045e4458693997a424994b (patch)
treef490ed4066c5aee7748669cd01e810e6e5846f38 /src/liballoc
parent9351c2c8e78e299ad7d53865f8700a462dfbb500 (diff)
parentca115dd083a1fe1d2b4892c5e50e49eb83ff1f3c (diff)
Auto merge of #38574 - Mark-Simulacrum:box-free-unspecialize, r=eddyb
Remove special case for Box<ZST> in trans

Remove extra lang item, `exchange_free`; use `box_free` instead.

Trans used to insert code equivalent to `box_free` in a wrapper around
`exchange_free`, and that code is now removed from trans.

Fixes #37710.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/heap.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index a1e32636980..81ed4be7763 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -144,6 +144,7 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
 }
 
 #[cfg(not(test))]
+#[cfg(stage0)]
 #[lang = "exchange_free"]
 #[inline]
 unsafe fn exchange_free(ptr: *mut u8, old_size: usize, align: usize) {