---

yaml
---
r: 13503
b: refs/heads/master
c: 7b98fdd
h: refs/heads/master
i:
  13501: 21ad4ad
  13499: 54ef31c
  13495: 0125c42
  13487: d7c8386
  13471: 44deac9
  13439: accb9a9
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e3f73e443e265ee82ad9aa2825c2c5347ac2d3d4
+refs/heads/master: 7b98fdd2699dfcc61499c3c4310c49ded7ea4670
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/native.rs

@@ -812,6 +812,26 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::native_item,
         Store(bcx, C_uint(ccx, shape::llsize_of_real(ccx, lltp_ty)),
               fcx.llretptr);
       }
+      "move_val" {
+        let tp_ty = substs.tys[0];
+        let src = {bcx: bcx,
+                   val: get_param(decl, first_real_arg + 1u),
+                   kind: owned };
+        bcx = move_val(bcx, DROP_EXISTING,
+                       get_param(decl, first_real_arg),
+                       src,
+                       tp_ty);
+      }
+      "move_val_init" {
+        let tp_ty = substs.tys[0];
+        let src = {bcx: bcx,
+                   val: get_param(decl, first_real_arg + 1u),
+                   kind: owned };
+        bcx = move_val(bcx, INIT,
+                       get_param(decl, first_real_arg),
+                       src,
+                       tp_ty);
+      }
       "min_align_of" {
         let tp_ty = substs.tys[0];
         let lltp_ty = type_of::type_of(ccx, tp_ty);

trunk/src/rustc/middle/trans/type_use.rs

@@ -79,7 +79,9 @@ fn type_uses_for(ccx: @crate_ctxt, fn_id: def_id, n_tps: uint)
             let flags = alt check *i.ident {
               "visit_ty" { 3u }
               "size_of" |  "pref_align_of" | "min_align_of" |
-              "init" |  "reinterpret_cast" { use_repr }
+              "init" |  "reinterpret_cast" | "move_val" | "move_val_init" {
+                use_repr
+              }
               "get_tydesc" | "needs_drop" { use_tydesc }
               "forget" | "addr_of" { 0u }
             };

trunk/src/rustc/middle/typeck/check.rs

@@ -454,6 +454,7 @@ impl methods for @fn_ctxt {
           none { result::err("no block is in scope here") }
         }
     }
+    #[inline(always)]
     fn write_ty(node_id: ast::node_id, ty: ty::t) {
         #debug["write_ty(%d, %s) in fcx %s",
                node_id, ty_to_str(self.tcx(), ty), self.tag()];
@@ -2303,6 +2304,11 @@ fn check_intrinsic_type(ccx: @crate_ctxt, it: @ast::native_item) {
                             param(ccx, 1u)) }
       "addr_of" { (1u, [arg(ast::by_ref, param(ccx, 0u))],
                    ty::mk_imm_ptr(tcx, param(ccx, 0u))) }
+      "move_val" | "move_val_init" {
+        (1u, [arg(ast::by_mutbl_ref, param(ccx, 0u)),
+              arg(ast::by_move, param(ccx, 0u))],
+         ty::mk_nil(tcx))
+      }
       "needs_drop" { (1u, [], ty::mk_bool(tcx)) }
 
       "visit_ty" {

trunk/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2012-06-14 623d825
+  macos-x86_64 ab8d81cf3f538cd259cbec2be9615688482f9bc1
+  macos-i386 1ec2b3425fab510684858bb7b28f2c2ad474d5af
+  freebsd-x86_64 f5d4c97cc8900c3eb24584ec3234abd7884b9598
+  linux-x86_64 dc6a402bc4b25510af6166c62cdb9f77a62b3e28
+  linux-i386 c70b86e8065b9a41d71876a05940f1a07da26d46
+  winnt-i386 b576dd7db9c1b4fcc7c2363c5f6856d021945402
+
 S 2012-06-12 11e30b2
   macos-x86_64 b6e031112f4619dcd5aa708cf9ea9871a7b11595
   macos-i386 497875c1fb6289c704485b8bf2e3c40c7918bf4e

trunk/src/test/run-pass/intrinsic-move-val.rs

@@ -0,0 +1,12 @@
+#[abi = "rust-intrinsic"]
+native mod rusti {
+    fn move_val_init<T>(&dst: T, -src: T);
+    fn move_val<T>(&dst: T, -src: T);
+}
+
+fn main() {
+    let mut x = @1;
+    let mut y = @2;
+    rusti::move_val(y, x);
+    assert *y == 1;
+}