Skip to content

Commit 2fe6810

Browse files
committed
---
yaml --- r: 194491 b: refs/heads/try c: 5733726 h: refs/heads/master i: 194489: c36dd6c 194487: 5287933 v: v3
1 parent a59d99c commit 2fe6810

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 242ed0b7c0f6a21096f2cc3e1ad1bdb176d02545
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a923278c6278c63468d74772c58dbf788e88f58c
5-
refs/heads/try: 5bc35b1852ea3b7871befeeeec7531107e147278
5+
refs/heads/try: 5733726508bbfddebf1024e41b2d34439d548bdb
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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)