Index: lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
===================================================================
--- lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -1019,9 +1019,23 @@
       Base = States[BDV].getBaseValue();
     }
     assert(Base && "Can't be null");
-    // The cast is needed since base traversal may strip away bitcasts
-    if (Base->getType() != Input->getType() && InsertPt)
-      Base = new BitCastInst(Base, Input->getType(), "cast", InsertPt);
+    if (Base->getType() != Input->getType() && InsertPt) {
+      if (!Base->getType()->isVectorTy() && !Input->getType()->isVectorTy())
+        // The cast is needed since base traversal may strip away bitcasts.
+        Base = new BitCastInst(Base, Input->getType(), "cast", InsertPt);
+      else {
+        // Handle the case when derived pointer is vector and base is scalar.
+        if (!Base->getType()->isVectorTy() && Input->getType()->isVectorTy()) {
+          if (Base->getType() != Input->getType()->getScalarType())
+            Base = new BitCastInst(Base, Input->getType()->getScalarType(),
+                                   "cast", InsertPt);
+          IRBuilder<> Builder(InsertPt);
+          Base = Builder.CreateVectorSplat(
+              cast<VectorType>(Input->getType())->getNumElements(), Base, "base");
+        } else
+          llvm_unreachable("unimplemented case");
+      }
+    }
     return Base;
   };
 
Index: test/Transforms/RewriteStatepointsForGC/scalar-base-vector.ll
===================================================================
--- /dev/null
+++ 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
+}