diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-03-18 00:20:52 +0100 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-03-26 14:08:55 +0100 |
| commit | 5bc35b1852ea3b7871befeeeec7531107e147278 (patch) | |
| tree | e8ce4bb4dc59b273c817b92290d5bdc3ae15c879 /src | |
| parent | 7c671e51770e1e818a57b07bb831f50840049660 (diff) | |
| download | rust-5bc35b1852ea3b7871befeeeec7531107e147278.tar.gz rust-5bc35b1852ea3b7871befeeeec7531107e147278.zip | |
filling-drop: switch `DTOR_NEEDED` and `DTOR_DONE` to non-trivial values.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/mem.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/trans/adt.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index e5b6c3f3472..7fea029e02d 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -334,7 +334,7 @@ macro_rules! repeat_u8_as_u64 { // But having the sign bit set is a pain, so 0x1d is probably better. // // And of course, 0x00 brings back the old world of zero'ing on drop. -#[cfg(not(stage0))] pub const POST_DROP_U8: u8 = 0x0; +#[cfg(not(stage0))] pub const POST_DROP_U8: u8 = 0x1d; #[cfg(not(stage0))] pub const POST_DROP_U32: u32 = repeat_u8_as_u32!(POST_DROP_U8); #[cfg(not(stage0))] pub const POST_DROP_U64: u64 = repeat_u8_as_u64!(POST_DROP_U8); diff --git a/src/librustc_trans/trans/adt.rs b/src/librustc_trans/trans/adt.rs index 9f90b5cea5f..dddc2d2be48 100644 --- a/src/librustc_trans/trans/adt.rs +++ b/src/librustc_trans/trans/adt.rs @@ -166,7 +166,7 @@ macro_rules! repeat_u8_as_u64 { (repeat_u8_as_u32!($name) as u64)) } } -pub const DTOR_NEEDED: u8 = 0x1; +pub const DTOR_NEEDED: u8 = 0xd4; pub const DTOR_NEEDED_U32: u32 = repeat_u8_as_u32!(DTOR_NEEDED); pub const DTOR_NEEDED_U64: u64 = repeat_u8_as_u64!(DTOR_NEEDED); #[allow(dead_code)] @@ -178,7 +178,7 @@ pub fn dtor_needed_usize(ccx: &CrateContext) -> usize { } } -pub const DTOR_DONE: u8 = 0x0; +pub const DTOR_DONE: u8 = 0x1d; pub const DTOR_DONE_U32: u32 = repeat_u8_as_u32!(DTOR_DONE); pub const DTOR_DONE_U64: u64 = repeat_u8_as_u64!(DTOR_DONE); #[allow(dead_code)] |