---

yaml
---
r: 13578
b: refs/heads/master
c: 60a6582
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 64912c9a56415c8a8586cd743ddbf3ab9baea2de
+refs/heads/master: 60a658250ea2ee6dd10425d7070c373262762b1c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

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

@@ -1198,7 +1198,14 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
             }
           }
           ast::neg {
-            oprnd_t = structurally_resolved_type(fcx, oprnd.span, oprnd_t);
+            // If the operand's type is an integral type variable, we
+            // don't want to resolve it yet, because the rest of the
+            // typing context might not have had the opportunity to
+            // constrain it yet.
+            if !(ty::type_is_var_integral(oprnd_t)) {
+                oprnd_t = structurally_resolved_type(fcx, oprnd.span,
+                                                     oprnd_t);
+            }
             if !(ty::type_is_integral(oprnd_t) ||
                  ty::type_is_fp(oprnd_t)) {
                 oprnd_t = check_user_unop(fcx, "-", "unary-", expr,

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

@@ -16,22 +16,22 @@ fn main() {
 
     let _i: i8 = -128;
     let j = -128;
-    // id_i8(j);
+    id_i8(j);
     id_i8(-128);
 
     let _i: i16 = -32_768;
     let j = -32_768;
-    // id_i16(j);
+    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(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(j);
     id_i64(-9_223_372_036_854_775_808);
 
     let _i: uint = 1;