---

yaml
---
r: 156590
b: refs/heads/try
c: 61ab2ea
h: refs/heads/master
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: 1ee345a87b05a4972e100f148819d2020c55381f
+refs/heads/try: 61ab2ea08ae669711c5d9c0c069da2d0a8606639
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

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

@@ -720,12 +720,12 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {
     }
 
     pub fn max_obj_size(&self) -> u64 {
-        1<<31 /* FIXME: select based on architecture */
+        1<<31 /* FIXME #18069: select based on architecture */
     }
 
     pub fn report_overbig_object(&self, obj: ty::t) -> ! {
         self.sess().fatal(
-            format!("Objects of type `{}` are too big for the current ABI",
+            format!("the type `{}` is too big for the current architecture",
                     obj.repr(self.tcx())).as_slice())
     }
 }

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

@@ -499,7 +499,7 @@ pub fn trans_fail<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
     let loc = bcx.sess().codemap().lookup_char_pos(sp.lo);
     let filename = token::intern_and_get_ident(loc.file.name.as_slice());
     let filename = C_str_slice(ccx, filename);
-    let line = C_int(ccx, loc.line as i64);
+    let line = C_uint(ccx, loc.line);
     let expr_file_line_const = C_struct(ccx, &[v_str, filename, line], false);
     let expr_file_line = consts::const_addr_of(ccx, expr_file_line_const, ast::MutImmutable);
     let args = vec!(expr_file_line);
@@ -526,7 +526,7 @@ pub fn trans_fail_bounds_check<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
 
     // Invoke the lang item
     let filename = C_str_slice(ccx,  filename);
-    let line = C_int(ccx, loc.line as i64);
+    let line = C_uint(ccx, loc.line);
     let file_line_const = C_struct(ccx, &[filename, line], false);
     let file_line = consts::const_addr_of(ccx, file_line_const, ast::MutImmutable);
     let args = vec!(file_line, index, len);

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

@@ -28,9 +28,9 @@ use std::num::CheckedMul;
 
 // LLVM doesn't like objects that are too big. Issue #17913
 fn ensure_array_fits_in_address_space(ccx: &CrateContext,
-                                       llet: Type,
-                                       size: machine::llsize,
-                                       scapegoat: ty::t) {
+                                      llet: Type,
+                                      size: machine::llsize,
+                                      scapegoat: ty::t) {
     let esz = machine::llsize_of_alloc(ccx, llet);
     match esz.checked_mul(&size) {
         Some(n) if n < ccx.max_obj_size() => {}

branches/try/src/test/compile-fail/simple-oversized-array.rs renamed to branches/try/src/test/compile-fail/huge-array-simple.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: too big for the current ABI
+// error-pattern: too big for the current
 
 fn main() {
    let fat : [u8, ..1<<61] = [0, ..1<<61];

branches/try/src/test/compile-fail/oversized-array.rs renamed to branches/try/src/test/compile-fail/huge-array.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: are too big for the current ABI
+// error-pattern: too big for the current
 
 struct S32<T> {
     v0: T,