Index: llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ llvm/trunk/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -2601,6 +2601,34 @@
       }
   }
 
+  // Nasty workaround - The base computation code in the main algorithm doesn't
+  // consider the fact that a GEP can be used to convert a scalar to a vector.
+  // The right fix for this is to integrate GEPs into the base rewriting
+  // algorithm properly, this is just a short term workaround to prevent
+  // crashes by canonicalizing such GEPs into fully vector GEPs.
+  for (Instruction &I : instructions(F)) {
+    if (!isa<GetElementPtrInst>(I))
+      continue;
+
+    unsigned VF = 0;
+    bool HasScalarOperand = false;
+    for (unsigned i = 0; i < I.getNumOperands(); i++)
+      if (I.getOperand(i)->getType()->isVectorTy())
+        VF = I.getOperand(i)->getType()->getVectorNumElements();
+      else
+        HasScalarOperand = true;
+
+    if (HasScalarOperand && VF != 0) {
+      IRBuilder<> B(&I);
+      for (unsigned i = 0; i < I.getNumOperands(); i++)
+        if (!I.getOperand(i)->getType()->isVectorTy()) {
+          auto *Splat = B.CreateVectorSplat(VF, I.getOperand(i));
+          I.setOperand(i, Splat);
+          MadeChange = true;
+        }
+    }
+  }
+
   MadeChange |= insertParsePoints(F, DT, TTI, ParsePointNeeded);
   return MadeChange;
 }
Index: llvm/trunk/test/Transforms/RewriteStatepointsForGC/base-vector.ll
===================================================================
--- llvm/trunk/test/Transforms/RewriteStatepointsForGC/base-vector.ll
+++ llvm/trunk/test/Transforms/RewriteStatepointsForGC/base-vector.ll
@@ -253,7 +253,7 @@
 ; CHECK: @llvm.experimental.gc.statepoint.p0f_isVoidf{{.*}}<4 x i64 addrspace(1)*> %vec1)
 ; CHECK: %vec1.relocated = call coldcc <4 x i8 addrspace(1)*> @llvm.experimental.gc.relocate.v4p1i8
 ; CHECK: %vec1.relocated.casted = bitcast <4 x i8 addrspace(1)*> %vec1.relocated to <4 x i64 addrspace(1)*>
-; CHECK: %vec2.remat = getelementptr i64, <4 x i64 addrspace(1)*> %vec1.relocated.casted, i32 1024
+; CHECK: %vec2.remat = getelementptr i64, <4 x i64 addrspace(1)*> %vec1.relocated.casted, <4 x i32> <i32 1024, i32 1024, i32 1024, i32 1024>
 ; CHECK: call void @use_vec(<4 x i64 addrspace(1)*> %vec2.remat)
 entry:
   %vec2 = getelementptr i64, <4 x i64 addrspace(1)*> %vec1, i32 1024
Index: llvm/trunk/test/Transforms/RewriteStatepointsForGC/scalar-base-vector.ll
===================================================================
--- llvm/trunk/test/Transforms/RewriteStatepointsForGC/scalar-base-vector.ll
+++ llvm/trunk/test/Transforms/RewriteStatepointsForGC/scalar-base-vector.ll
@@ -0,0 +1,26 @@
+; RUN: opt < %s -rewrite-statepoints-for-gc -S | FileCheck  %s
+; RUN: opt < %s -passes=rewrite-statepoints-for-gc -S | FileCheck  %s
+
+declare void @do_safepoint()
+declare i8 addrspace(1)* @def_ptr()
+
+define i32 addrspace(1)* @test1(i8 addrspace(1)* %base1, <2 x i64> %offsets) gc "statepoint-example" {
+entry:
+  br i1 undef, label %first, label %second
+
+first:
+  %base2 = call i8 addrspace(1)* @def_ptr() [ "deopt"(i32 0, i32 -1, i32 0, i32 0, i32 0) ]
+  br label %second
+
+second:
+; CHECK-LABEL: @test1(
+; CHECK: gc.statepoint
+; CHECK-DAG: (%ptr.base, %ptr)
+; CHECK-DAG: (%ptr.base, %ptr.base)
+  %phi = phi i8 addrspace(1)* [ %base1, %entry ], [ %base2, %first ]
+  %base.i32 = bitcast i8 addrspace(1)* %phi to i32 addrspace(1)*
+  %vec = getelementptr i32, i32 addrspace(1)* %base.i32, <2 x i64> %offsets
+  %ptr = extractelement <2 x i32 addrspace(1)*> %vec, i32 1
+  call void @do_safepoint() [ "deopt"(i32 0, i32 -1, i32 0, i32 0, i32 0) ]
+  ret i32 addrspace(1)* %ptr
+}