---

yaml
---
r: 12744
b: refs/heads/master
c: 8affc78
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2830bc3d311a2ea1a7a6df505abf81192f12ffbd
+refs/heads/master: 8affc78e8a0e420e1755a34fc7f5e4021c512e9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/back/abi.rs

@@ -1,55 +1,54 @@
 
 
 
-// FIXME: Most of these should be uints.
-const rc_base_field_refcnt: int = 0;
+const rc_base_field_refcnt: uint = 0u;
 
-const task_field_refcnt: int = 0;
+const task_field_refcnt: uint = 0u;
 
-const task_field_stk: int = 2;
+const task_field_stk: uint = 2u;
 
-const task_field_runtime_sp: int = 3;
+const task_field_runtime_sp: uint = 3u;
 
-const task_field_rust_sp: int = 4;
+const task_field_rust_sp: uint = 4u;
 
-const task_field_gc_alloc_chain: int = 5;
+const task_field_gc_alloc_chain: uint = 5u;
 
-const task_field_dom: int = 6;
+const task_field_dom: uint = 6u;
 
-const n_visible_task_fields: int = 7;
+const n_visible_task_fields: uint = 7u;
 
-const dom_field_interrupt_flag: int = 1;
+const dom_field_interrupt_flag: uint = 1u;
 
-const frame_glue_fns_field_mark: int = 0;
+const frame_glue_fns_field_mark: uint = 0u;
 
-const frame_glue_fns_field_drop: int = 1;
+const frame_glue_fns_field_drop: uint = 1u;
 
-const frame_glue_fns_field_reloc: int = 2;
+const frame_glue_fns_field_reloc: uint = 2u;
 
-const box_field_refcnt: int = 0;
-const box_field_tydesc: int = 1;
-const box_field_prev: int = 2;
-const box_field_next: int = 3;
-const box_field_body: int = 4;
+const box_field_refcnt: uint = 0u;
+const box_field_tydesc: uint = 1u;
+const box_field_prev: uint = 2u;
+const box_field_next: uint = 3u;
+const box_field_body: uint = 4u;
 
-const general_code_alignment: int = 16;
+const general_code_alignment: uint = 16u;
 
-const tydesc_field_first_param: int = 0;
-const tydesc_field_size: int = 1;
-const tydesc_field_align: int = 2;
-const tydesc_field_take_glue: int = 3;
-const tydesc_field_drop_glue: int = 4;
-const tydesc_field_free_glue: int = 5;
-const tydesc_field_unused: int = 6;
-const tydesc_field_sever_glue: int = 7;
-const tydesc_field_mark_glue: int = 8;
-const tydesc_field_unused2: int = 9;
-const tydesc_field_unused_2: int = 10;
-const tydesc_field_shape: int = 11;
-const tydesc_field_shape_tables: int = 12;
-const tydesc_field_n_params: int = 13;
-const tydesc_field_obj_params: int = 14; // FIXME unused
-const n_tydesc_fields: int = 15;
+const tydesc_field_first_param: uint = 0u;
+const tydesc_field_size: uint = 1u;
+const tydesc_field_align: uint = 2u;
+const tydesc_field_take_glue: uint = 3u;
+const tydesc_field_drop_glue: uint = 4u;
+const tydesc_field_free_glue: uint = 5u;
+const tydesc_field_unused: uint = 6u;
+const tydesc_field_sever_glue: uint = 7u;
+const tydesc_field_mark_glue: uint = 8u;
+const tydesc_field_unused2: uint = 9u;
+const tydesc_field_unused_2: uint = 10u;
+const tydesc_field_shape: uint = 11u;
+const tydesc_field_shape_tables: uint = 12u;
+const tydesc_field_n_params: uint = 13u;
+const tydesc_field_obj_params: uint = 14u; // FIXME unused (#2351)
+const n_tydesc_fields: uint = 15u;
 
 const cmp_glue_op_eq: uint = 0u;
 
@@ -58,23 +57,23 @@ const cmp_glue_op_lt: uint = 1u;
 const cmp_glue_op_le: uint = 2u;
 
 // The two halves of a closure: code and environment.
-const fn_field_code: int = 0;
-const fn_field_box: int = 1;
+const fn_field_code: uint = 0u;
+const fn_field_box: uint = 1u;
 
 // closures, see trans_closure.rs
-const closure_body_ty_params: int = 0;
-const closure_body_bindings: int = 1;
+const closure_body_ty_params: uint = 0u;
+const closure_body_bindings: uint = 1u;
 
-const vec_elt_fill: int = 0;
+const vec_elt_fill: uint = 0u;
 
-const vec_elt_alloc: int = 1;
+const vec_elt_alloc: uint = 1u;
 
-const vec_elt_elems: int = 2;
+const vec_elt_elems: uint = 2u;
 
-const slice_elt_base: int = 0;
-const slice_elt_len: int = 1;
+const slice_elt_base: uint = 0u;
+const slice_elt_len: uint = 1u;
 
-const worst_case_glue_call_args: int = 7;
+const worst_case_glue_call_args: uint = 7u;
 
 const abi_version: uint = 1u;
 

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

@@ -274,7 +274,7 @@ fn extract_variant_args(bcx: block, pat_id: ast::node_id,
     if size > 0u && (*variants).len() != 1u {
         let enumptr =
             PointerCast(bcx, val, T_opaque_enum_ptr(ccx));
-        blobptr = GEPi(bcx, enumptr, [0, 1]);
+        blobptr = GEPi(bcx, enumptr, [0u, 1u]);
     }
     let vdefs_tg = vdefs.enm;
     let vdefs_var = vdefs.var;
@@ -410,7 +410,7 @@ fn compile_submatch(bcx: block, m: match, vals: [ValueRef],
         let mut rec_vals = [];
         for vec::each(rec_fields) {|field_name|
             let ix = option::get(ty::field_idx(field_name, fields));
-            rec_vals += [GEPi(bcx, val, [0, ix as int])];
+            rec_vals += [GEPi(bcx, val, [0u, ix])];
         }
         compile_submatch(bcx, enter_rec(dm, m, col, rec_fields, val),
                          rec_vals + vals_left, chk, exits);
@@ -425,7 +425,7 @@ fn compile_submatch(bcx: block, m: match, vals: [ValueRef],
         };
         let mut tup_vals = [], i = 0u;
         while i < n_tup_elts {
-            tup_vals += [GEPi(bcx, val, [0, i as int])];
+            tup_vals += [GEPi(bcx, val, [0u, i])];
             i += 1u;
         }
         compile_submatch(bcx, enter_tup(dm, m, col, val, n_tup_elts),
@@ -436,7 +436,7 @@ fn compile_submatch(bcx: block, m: match, vals: [ValueRef],
     // Unbox in case of a box field
     if any_box_pat(m, col) {
         let box = Load(bcx, val);
-        let unboxed = GEPi(bcx, box, [0, abi::box_field_body]);
+        let unboxed = GEPi(bcx, box, [0u, abi::box_field_body]);
         compile_submatch(bcx, enter_box(dm, m, col, val), [unboxed]
                          + vals_left, chk, exits);
         ret;
@@ -462,7 +462,7 @@ fn compile_submatch(bcx: block, m: match, vals: [ValueRef],
             } else {
                 let enumptr =
                     PointerCast(bcx, val, T_opaque_enum_ptr(ccx));
-                let discrimptr = GEPi(bcx, enumptr, [0, 0]);
+                let discrimptr = GEPi(bcx, enumptr, [0u, 0u]);
                 test_val = Load(bcx, discrimptr);
                 kind = switch;
             }
@@ -711,22 +711,22 @@ fn bind_irrefutable_pat(bcx: block, pat: @ast::pat, val: ValueRef,
         let rec_fields = ty::get_fields(node_id_type(bcx, pat.id));
         for vec::each(fields) {|f|
             let ix = option::get(ty::field_idx(f.ident, rec_fields));
-            let fldptr = GEPi(bcx, val, [0, ix as int]);
+            let fldptr = GEPi(bcx, val, [0u, ix]);
             bcx = bind_irrefutable_pat(bcx, f.pat, fldptr, make_copy);
         }
       }
       ast::pat_tup(elems) {
         let mut i = 0u;
         for vec::each(elems) {|elem|
-            let fldptr = GEPi(bcx, val, [0, i as int]);
+            let fldptr = GEPi(bcx, val, [0u, i]);
             bcx = bind_irrefutable_pat(bcx, elem, fldptr, make_copy);
             i += 1u;
         }
       }
       ast::pat_box(inner) {
         let box = Load(bcx, val);
         let unboxed =
-            GEPi(bcx, box, [0, abi::box_field_body]);
+            GEPi(bcx, box, [0u, abi::box_field_body]);
         bcx = bind_irrefutable_pat(bcx, inner, unboxed, true);
       }
       ast::pat_uniq(inner) {