---

yaml
---
r: 139258
b: refs/heads/try2
c: 89a7407
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 441313fc0ca635be18d1175e7dc265ab9ffa9d7d
+refs/heads/try2: 89a7407c999449c56f9b00145cfbdfbb49fbde7c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/tvec.rs

@@ -427,19 +427,17 @@ pub fn write_content(bcx: block,
 
                     let loop_counter = {
                         // i = 0
-                        let i = alloca(loop_bcx, T_i64());
-                        Store(loop_bcx, C_i64(0), i);
+                        let i = alloca(loop_bcx, bcx.ccx().int_type);
+                        Store(loop_bcx, C_uint(bcx.ccx(), 0), i);
 
                         Br(loop_bcx, cond_bcx.llbb);
                         i
                     };
 
                     { // i < count
                         let lhs = Load(cond_bcx, loop_counter);
-                        let rhs = C_integral(T_i64(), count as u64, lib::llvm::False);
-                        let cmp_lr = ICmp(cond_bcx, lib::llvm::IntULT, lhs, rhs);
-                        let zext = ZExt(cond_bcx, cmp_lr, T_i8());
-                        let cond_val = ICmp(cond_bcx, lib::llvm::IntNE, zext, C_u8(0));
+                        let rhs = C_uint(bcx.ccx(), count);
+                        let cond_val = ICmp(cond_bcx, lib::llvm::IntULT, lhs, rhs);
 
                         CondBr(cond_bcx, cond_val, set_bcx.llbb, next_bcx.llbb);
                     }
@@ -454,7 +452,7 @@ pub fn write_content(bcx: block,
 
                     { // i += 1
                         let i = Load(inc_bcx, loop_counter);
-                        let plusone = Add(inc_bcx, i, C_i64(1));
+                        let plusone = Add(inc_bcx, i, C_uint(bcx.ccx(), 1));
                         Store(inc_bcx, plusone, loop_counter);
 
                         Br(inc_bcx, cond_bcx.llbb);