---

yaml
---
r: 13469
b: refs/heads/master
c: c6462ee
h: refs/heads/master
i:
  13467: a4859b0
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 74d2f56f217b12114b87cf09da4cbdc29c93ed8a
+refs/heads/master: c6462eec304ce9d786aab2d6a1314725490aeeaa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

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

@@ -812,26 +812,6 @@ 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/reflect.rs

@@ -156,6 +156,7 @@ impl methods for reflector {
           }
 
           // FIXME: fetch constants out of intrinsic:: for the numbers.
+          // (#2594)
           ty::ty_fn(fty) {
             let pureval = alt fty.purity {
               ast::pure_fn { 0u }
@@ -217,7 +218,7 @@ impl methods for reflector {
           // FIXME: visiting all the variants in turn is probably
           // not ideal. It'll work but will get costly on big enums.
           // Maybe let the visitor tell us if it wants to visit only
-          // a particular variant?
+          // a particular variant? (#2595)
           ty::ty_enum(did, substs) {
             let bcx = self.bcx;
             let tcx = bcx.ccx().tcx;

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

@@ -79,9 +79,7 @@ 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" | "move_val" | "move_val_init" {
-                use_repr
-              }
+              "init" |  "reinterpret_cast" { use_repr }
               "get_tydesc" | "needs_drop" { use_tydesc }
               "forget" | "addr_of" { 0u }
             };

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

@@ -456,7 +456,6 @@ 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()];
@@ -2311,11 +2310,6 @@ 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" {