---

yaml
---
r: 11620
b: refs/heads/master
c: 15df395
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3a4c96a196b7b4578b3beec26df22975e2f1bb43
+refs/heads/master: 15df3950ad4a1d2e9deb30d0ebdcb8dc7da00b63
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

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

@@ -288,7 +288,7 @@ fn mk_obstack_token(ccx: crate_ctxt, fcx: fn_ctxt) ->
 // return type, use bump_ptr().
 fn ptr_offs(bcx: block, base: ValueRef, sz: ValueRef) -> ValueRef {
     let raw = PointerCast(bcx, base, T_ptr(T_i8()));
-    GEP(bcx, raw, [sz])
+    InBoundsGEP(bcx, raw, [sz])
 }
 
 // Increment a pointer by a given amount and then cast it to be a pointer
@@ -2402,12 +2402,12 @@ fn trans_index(cx: block, ex: @ast::expr, base: @ast::expr,
         trans_fail(bcx, some(ex.span), "bounds check")
     };
     let elt = if check type_has_static_size(ccx, unit_ty) {
-        let elt_1 = GEP(bcx, body, [ix_val]);
+        let elt_1 = InBoundsGEP(bcx, body, [ix_val]);
         let llunitty = type_of(ccx, unit_ty);
         PointerCast(bcx, elt_1, T_ptr(llunitty))
     } else {
         body = PointerCast(bcx, body, T_ptr(T_i8()));
-        GEP(bcx, body, [scaled_ix])
+        InBoundsGEP(bcx, body, [scaled_ix])
     };
     ret lval_owned(bcx, elt);
 }