Skip to content

Commit d2678c4

Browse files
committed
---
yaml --- r: 194805 b: refs/heads/auto c: 5733726 h: refs/heads/master i: 194803: 1028da3 v: v3
1 parent bcd3c15 commit d2678c4

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 5bc35b1852ea3b7871befeeeec7531107e147278
13+
refs/heads/auto: 5733726508bbfddebf1024e41b2d34439d548bdb
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/mem.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,15 @@ pub unsafe fn zeroed<T>() -> T {
173173
#[inline]
174174
#[unstable(feature = "filling_drop")]
175175
pub unsafe fn dropped<T>() -> T {
176-
let mut x: T = uninitialized();
177-
let p: *mut u8 = transmute(&mut x as *mut T);
178-
for i in 0..size_of::<T>() {
179-
*p.offset(i as isize) = POST_DROP_U8;
180-
}
181-
x
176+
#[cfg(stage0)]
177+
#[inline(always)]
178+
unsafe fn dropped_impl<T>() -> T { zeroed() }
179+
180+
#[cfg(not(stage0))]
181+
#[inline(always)]
182+
unsafe fn dropped_impl<T>() -> T { intrinsics::init_dropped() }
183+
184+
dropped_impl()
182185
}
183186

184187
/// Create an uninitialized value.

0 commit comments

Comments
 (0)