diff --git a/lib/Target/X86/X86TargetTransformInfo.cpp b/lib/Target/X86/X86TargetTransformInfo.cpp
index e75653e12dd8..960eddca9257 100644
--- a/lib/Target/X86/X86TargetTransformInfo.cpp
+++ b/lib/Target/X86/X86TargetTransformInfo.cpp
@@ -874,7 +874,7 @@ int X86TTIImpl::getShuffleCost(TTI::ShuffleKind Kind, Type *Tp, int Index,
 
   // Subvector extractions are free if they start at beginning of the
   // vector.
-  if (Kind == TTI::SK_ExtractSubvector &&
+  if (Kind == TTI::SK_ExtractSubvector && LT.second.isVector() &&
       ((Index % LT.second.getVectorNumElements()) == 0))
     return 0;