Skip to content

Commit 9884993

Browse files
committed
---
yaml --- r: 224145 b: refs/heads/beta c: 75da81e h: refs/heads/master i: 224143: 48134a4 v: v3
1 parent 82e83f0 commit 9884993

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: b325e4f28e0735bb951bdf9f1db1206bd3ee715b
26+
refs/heads/beta: 75da81e78231a6fb5d90b3918bebe867249eb14c
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

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