---

yaml
---
r: 66398
b: refs/heads/master
c: f463e69
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 90ad44428759617723f2f4630aa22bbed6f33aaf
+refs/heads/master: f463e69d203ffdd1a0c6c73612a0ba514a700a78
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/trans/build.rs

@@ -610,12 +610,21 @@ pub fn GEP(cx: block, Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {
 
 // Simple wrapper around GEP that takes an array of ints and wraps them
 // in C_i32()
-//
-// FIXME #6571: Use a small-vector optimization to avoid allocations here.
+#[inline]
 pub fn GEPi(cx: block, base: ValueRef, ixs: &[uint]) -> ValueRef {
-    let v = do vec::map(ixs) |i| { C_i32(*i as i32) };
-    count_insn(cx, "gepi");
-    return InBoundsGEP(cx, base, v);
+    // Small vector optimization. This should catch 100% of the cases that
+    // we care about.
+    if ixs.len() < 16 {
+        let mut small_vec = [ C_i32(0), ..16 ];
+        for ixs.eachi |i, &ix| {
+            small_vec[i] = C_i32(ix as i32)
+        }
+        InBoundsGEP(cx, base, small_vec.slice(0, ixs.len()))
+    } else {
+        let v = do vec::map(ixs) |i| { C_i32(*i as i32) };
+        count_insn(cx, "gepi");
+        InBoundsGEP(cx, base, v)
+    }
 }
 
 pub fn InBoundsGEP(cx: block, Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {