---

yaml
---
r: 156591
b: refs/heads/try
c: 5bcd0a0
h: refs/heads/master
i:
  156589: 31e805c
  156587: d332e6c
  156583: 9910af1
  156575: c4673a8
v: v3

Author: arielb1

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: a34b8dec697014f15e725215e17ea8d956c0ab1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
-refs/heads/try: 61ab2ea08ae669711c5d9c0c069da2d0a8606639
+refs/heads/try: 5bcd0a0b5030487613bee37ed38945e42c4e6b85
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

branches/try/src/librustc/middle/trans/adt.rs

@@ -478,7 +478,7 @@ fn ensure_struct_fits_in_address_space(ccx: &CrateContext,
         offset += machine::llsize_of_alloc(ccx, llty);
 
         // We can get away with checking for overflow once per iteration,
-        // because field sizes are less than 1<<60.
+        // because field sizes are less than 1<<61.
         if offset >= ccx.max_obj_size() {
             ccx.report_overbig_object(scapegoat);
         }
@@ -498,7 +498,7 @@ fn ensure_enum_fits_in_address_space(ccx: &CrateContext,
     let discr_size = machine::llsize_of_alloc(ccx, ll_inttype(ccx, discr));
     let (field_size, field_align) = union_size_and_align(fields);
 
-    // This can't overflow because field_size, discr_size, field_align < 1<<60
+    // This can't overflow because field_size, discr_size, field_align < 1<<61
     let total_size = roundup(discr_size, field_align) + field_size;
 
     if total_size >= ccx.max_obj_size() {

branches/try/src/librustc/middle/trans/common.rs

@@ -596,17 +596,34 @@ pub fn C_u64(ccx: &CrateContext, i: u64) -> ValueRef {
 }
 
 pub fn C_int<I: AsI64>(ccx: &CrateContext, i: I) -> ValueRef {
-    C_integral(ccx.int_type(), i.as_i64() as u64, true)
+    let v = i.as_i64();
+
+    match machine::llbitsize_of_real(ccx.int_type()) {
+        32 => assert!(v < (1<<31) && v >= -(1<<31)),
+        64 => {},
+        n => fail!("unsupported target size: {}", n)
+    }
+
+    C_integral(ccx.int_type(), v as u64, true)
 }
 
 pub fn C_uint<I: AsU64>(ccx: &CrateContext, i: I) -> ValueRef {
-    C_integral(ccx.int_type(), i.as_u64(), false)
+    let v = i.as_u64();
+
+    match machine::llbitsize_of_real(ccx.int_type()) {
+        32 => assert!(v < (1<<32)),
+        64 => {},
+        n => fail!("unsupported target size: {}", n)
+    }
+
+    C_integral(ccx.int_type(), v, false)
 }
 
 pub trait AsI64 { fn as_i64(self) -> i64; }
 pub trait AsU64 { fn as_u64(self) -> u64; }
 
-// FIXME: remove the intptr conversions
+// FIXME: remove the intptr conversions, because they
+// are host-architecture-dependent
 impl AsI64 for i64 { fn as_i64(self) -> i64 { self as i64 }}
 impl AsI64 for i32 { fn as_i64(self) -> i64 { self as i64 }}
 impl AsI64 for int { fn as_i64(self) -> i64 { self as i64 }}