---

yaml
---
r: 13502
b: refs/heads/master
c: e3f73e4
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 56bd68976715caa808ad9a3f2efdf422d38d631c
+refs/heads/master: e3f73e443e265ee82ad9aa2825c2c5347ac2d3d4
 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/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

@@ -454,7 +454,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()];
@@ -2304,11 +2303,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" {

trunk/src/snapshots.txt

@@ -1,11 +1,3 @@
-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/compile-fail/integer-literal-suffix-inference.rs

@@ -0,0 +1,91 @@
+// xfail-test
+fn main() {
+
+    // the smallest positive values that need these types
+    let a8: i8 = 8;
+    let a16: i16 = 128;
+    let a32: i32 = 32_768;
+    let a64: i64 = 2_147_483_648;
+
+    // the smallest negative values that need these types
+    let c8: i8 = -9;
+    let c16: i16 = -129;
+    let c32: i32 = -32_769;
+    let c64: i64 = -2_147_483_649;
+
+    fn id_i8(n: i8) -> i8 { n }
+    fn id_i16(n: i16) -> i16 { n }
+    fn id_i32(n: i32) -> i32 { n }
+    fn id_i64(n: i64) -> i64 { n }
+
+    // the smallest values that need these types
+    let b8: u8 = 16;
+    let b16: u16 = 256;
+    let b32: u32 = 65_536;
+    let b64: u64 = 4_294_967_296;
+
+    fn id_u8(n: u8) -> u8 { n }
+    fn id_u16(n: u16) -> u16 { n }
+    fn id_u32(n: u32) -> u32 { n }
+    fn id_u64(n: u64) -> u64 { n }
+
+    id_i8(a8); // ok
+    id_i8(a16); //! ERROR mismatched types: expected `i8` but found `i16`
+    id_i8(a32); //! ERROR mismatched types: expected `i8` but found `i32`
+    id_i8(a64); //! ERROR mismatched types: expected `i8` but found `i64`
+
+    id_i16(a8); //! ERROR mismatched types: expected `i16` but found `i8`
+    id_i16(a16); // ok
+    id_i16(a32); //! ERROR mismatched types: expected `i16` but found `i32`
+    id_i16(a64); //! ERROR mismatched types: expected `i16` but found `i64`
+
+    id_i32(a8); //! ERROR mismatched types: expected `i32` but found `i8`
+    id_i32(a16); //! ERROR mismatched types: expected `i32` but found `i16`
+    id_i32(a32); // ok
+    id_i32(a64); //! ERROR mismatched types: expected `i32` but found `i64`
+
+    id_i64(a8); //! ERROR mismatched types: expected `i64` but found `i8`
+    id_i64(a16); //! ERROR mismatched types: expected `i64` but found `i16`
+    id_i64(a32); //! ERROR mismatched types: expected `i64` but found `i32`
+    id_i64(a64); // ok
+
+    id_i8(c8); // ok
+    id_i8(c16); //! ERROR mismatched types: expected `i8` but found `i16`
+    id_i8(c32); //! ERROR mismatched types: expected `i8` but found `i32`
+    id_i8(c64); //! ERROR mismatched types: expected `i8` but found `i64`
+
+    id_i16(c8); //! ERROR mismatched types: expected `i16` but found `i8`
+    id_i16(c16); // ok
+    id_i16(c32); //! ERROR mismatched types: expected `i16` but found `i32`
+    id_i16(c64); //! ERROR mismatched types: expected `i16` but found `i64`
+
+    id_i32(c8); //! ERROR mismatched types: expected `i32` but found `i8`
+    id_i32(c16); //! ERROR mismatched types: expected `i32` but found `i16`
+    id_i32(c32); // ok
+    id_i32(c64); //! ERROR mismatched types: expected `i32` but found `i64`
+
+    id_i64(a8); //! ERROR mismatched types: expected `i64` but found `i8`
+    id_i64(a16); //! ERROR mismatched types: expected `i64` but found `i16`
+    id_i64(a32); //! ERROR mismatched types: expected `i64` but found `i32`
+    id_i64(a64); // ok
+
+    id_u8(b8); // ok
+    id_u8(b16); //! ERROR mismatched types: expected `u8` but found `u16`
+    id_u8(b32); //! ERROR mismatched types: expected `u8` but found `u32`
+    id_u8(b64); //! ERROR mismatched types: expected `u8` but found `u64`
+
+    id_u16(b8); //! ERROR mismatched types: expected `u16` but found `u8`
+    id_u16(b16); // ok
+    id_u16(b32); //! ERROR mismatched types: expected `u16` but found `u32`
+    id_u16(b64); //! ERROR mismatched types: expected `u16` but found `u64`
+
+    id_u32(b8); //! ERROR mismatched types: expected `u32` but found `u8`
+    id_u32(b16); //! ERROR mismatched types: expected `u32` but found `u16`
+    id_u32(b32); // ok
+    id_u32(b64); //! ERROR mismatched types: expected `u32` but found `u64`
+
+    id_u64(b8); //! ERROR mismatched types: expected `u64` but found `u8`
+    id_u64(b16); //! ERROR mismatched types: expected `u64` but found `u16`
+    id_u64(b32); //! ERROR mismatched types: expected `u64` but found `u32`
+    id_u64(b64); // ok
+}

trunk/src/test/run-pass/integer-literal-suffix-inference.rs

@@ -0,0 +1,62 @@
+// xfail-test
+fn main() {
+
+    // The commented-out lines are ones that fail currently.  I'm
+    // working on figuring out why (#1425). -- lkuper
+
+    fn id_i8(n: i8) -> i8 { n }
+    fn id_i16(n: i16) -> i16 { n }
+    fn id_i32(n: i32) -> i32 { n }
+    fn id_i64(n: i64) -> i64 { n }
+
+    fn id_uint(n: uint) -> uint { n }
+    fn id_u8(n: u8) -> u8 { n }
+    fn id_u16(n: u16) -> u16 { n }
+    fn id_u32(n: u32) -> u32 { n }
+    fn id_u64(n: u64) -> u64 { n }
+
+    let _i: i8 = -128;
+    let j = -128;
+    // id_i8(j);
+    id_i8(-128);
+
+    let _i: i16 = -32_768;
+    let j = -32_768;
+    // id_i16(j);
+    id_i16(-32_768);
+
+    let _i: i32 = -2_147_483_648;
+    let j = -2_147_483_648;
+    // id_i32(j);
+    id_i32(-2_147_483_648);
+
+    let _i: i64 = -9_223_372_036_854_775_808;
+    let j = -9_223_372_036_854_775_808;
+    // id_i64(j);
+    id_i64(-9_223_372_036_854_775_808);
+
+    let _i: uint = 1;
+    let j = 1;
+    id_uint(j);
+    id_uint(1);
+
+    let _i: u8 = 255;
+    let j = 255;
+    id_u8(j);
+    id_u8(255);
+
+    let _i: u16 = 65_535;
+    let j = 65_535;
+    id_u16(j);
+    id_u16(65_535);
+
+    let _i: u32 = 4_294_967_295;
+    let j = 4_294_967_295;
+    id_u32(j);
+    id_u32(4_294_967_295);
+
+    let _i: u64 = 18_446_744_073_709_551_615;
+    let j = 18_446_744_073_709_551_615;
+    id_u64(j);
+    id_u64(18_446_744_073_709_551_615);
+}