Index: include/llvm/Analysis/TargetTransformInfoImpl.h
===================================================================
--- include/llvm/Analysis/TargetTransformInfoImpl.h
+++ include/llvm/Analysis/TargetTransformInfoImpl.h
@@ -210,7 +210,7 @@
                              bool HasBaseReg, int64_t Scale) {
     // Guess that reg+reg addressing is allowed. This heuristic is taken from
     // the implementation of LSR.
-    return !BaseGV && BaseOffset == 0 && Scale <= 1;
+    return !BaseGV && BaseOffset == 0 && (Scale == 0 || Scale == 1);
   }
 
   bool isLegalMaskedStore(Type *DataType, int Consecutive) { return false; }