diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index 2d7dec4..4e7db4e 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -613,8 +613,9 @@
     case Instruction::GetElementPtr: {
       // generate a symbolic expression for the byte address
       const Constant *ptrVal = CE->getOperand(0);
-      std::vector<Value*> idxVec(CE->op_begin()+1, CE->op_end());
-      if (int64_t Offset = TD->getIndexedOffset(ptrVal->getType(), idxVec)) {
+      SmallVector<Value*, 8> idxVec(CE->op_begin()+1, CE->op_end());
+      if (int64_t Offset = TD->getIndexedOffset(ptrVal->getType(), &idxVec[0],
+                                                idxVec.size())) {
         if (Offset)
           O << "(";
         EmitConstantValueOnly(ptrVal);
diff --git a/lib/CodeGen/MachOWriter.cpp b/lib/CodeGen/MachOWriter.cpp
index 384dd3e..fe9d997 100644
--- a/lib/CodeGen/MachOWriter.cpp
+++ b/lib/CodeGen/MachOWriter.cpp
@@ -779,9 +779,9 @@
       //
       switch (CE->getOpcode()) {
       case Instruction::GetElementPtr: {
-        std::vector<Value*> Indexes(CE->op_begin()+1, CE->op_end());
+        SmallVector<Value*, 8> Indices(CE->op_begin()+1, CE->op_end());
         ScatteredOffset = TD->getIndexedOffset(CE->getOperand(0)->getType(),
-                                               Indexes);
+                                               &Indices[0], Indices.size());
         WorkList.push_back(CPair(CE->getOperand(0), PA));
         break;
       }