Skip to content

Commit 7107a9b

Browse files
committed
---
yaml --- r: 221039 b: refs/heads/auto c: 75da81e h: refs/heads/master i: 221037: 6200420 221035: 5c6996b 221031: 05938d9 221023: 9f06007 v: v3
1 parent 390a92c commit 7107a9b

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: b325e4f28e0735bb951bdf9f1db1206bd3ee715b
11+
refs/heads/auto: 75da81e78231a6fb5d90b3918bebe867249eb14c
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libcore/intrinsics.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,14 @@ extern "rust-intrinsic" {
184184
/// elements.
185185
pub fn size_of<T>() -> usize;
186186

187+
#[cfg(not(stage0))]
188+
/// Moves a value to an uninitialized memory location.
189+
///
190+
/// Drop glue is not run on the destination.
191+
pub fn move_val_init<T>(dst: *mut T, src: T);
192+
193+
// SNAP ba0e1cd
194+
#[cfg(stage0)]
187195
/// Moves a value to an uninitialized memory location.
188196
///
189197
/// Drop glue is not run on the destination.

branches/auto/src/librustc_typeck/check/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4894,9 +4894,7 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
48944894
"move_val_init" => {
48954895
(1,
48964896
vec!(
4897-
tcx.mk_mut_ref(tcx.mk_region(ty::ReLateBound(ty::DebruijnIndex::new(1),
4898-
ty::BrAnon(0))),
4899-
param(ccx, 0)),
4897+
tcx.mk_mut_ptr(param(ccx, 0)),
49004898
param(ccx, 0)
49014899
),
49024900
tcx.mk_nil())

0 commit comments

Comments
 (0)