about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-09-13 18:00:58 -0700
committerbors <bors@rust-lang.org>2013-09-13 18:00:58 -0700
commita241deb97931b7c993e88c600d2b35912730a7e8 (patch)
tree1dde294fe27c95e5b79b8b607f6284c0146aad2d /src
parent150b4ffcccbaf6f85b4b3f5be76305edb963689f (diff)
parent2dec95e417a71e1053d6b666b12d9cfdceaccb3c (diff)
downloadrust-a241deb97931b7c993e88c600d2b35912730a7e8.tar.gz
rust-a241deb97931b7c993e88c600d2b35912730a7e8.zip
auto merge of #9173 : thestinger/rust/offset, r=alexcrichton
This was intended to always use inbounds pointer arithmetic now.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/trans/intrinsic.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/librustc/middle/trans/intrinsic.rs b/src/librustc/middle/trans/intrinsic.rs
index 2232b8966b8..e81bc4a9196 100644
--- a/src/librustc/middle/trans/intrinsic.rs
+++ b/src/librustc/middle/trans/intrinsic.rs
@@ -404,11 +404,6 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
         "offset" => {
             let ptr = get_param(decl, first_real_arg);
             let offset = get_param(decl, first_real_arg + 1);
-            Ret(bcx, GEP(bcx, ptr, [offset]));
-        }
-        "offset_inbounds" => {
-            let ptr = get_param(decl, first_real_arg);
-            let offset = get_param(decl, first_real_arg + 1);
             Ret(bcx, InBoundsGEP(bcx, ptr, [offset]));
         }
         "memcpy32" => memcpy_intrinsic(bcx, "llvm.memcpy.p0i8.p0i8.i32", substs.tys[0], 32),