fix PR3995. A scale must be 1, 2, 4 or 8.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69284 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 18a574f..4b698ce 100644 (file)
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -1041,7 +1041,7 @@ bool X86DAGToDAGISel::MatchAddress(SDValue N, X86ISelAddressMode &AM,
     // a scaled index.
     if (Shift.getOpcode() == ISD::SRL && Shift.hasOneUse()) {
       unsigned ScaleLog = 8 - C1->getZExtValue();
-      if (ScaleLog > 0 && ScaleLog < 64 &&
+      if (ScaleLog > 0 && ScaleLog < 4 &&
           C2->getZExtValue() == (UINT64_C(0xff) << ScaleLog)) {
         SDValue Eight = CurDAG->getConstant(8, MVT::i8);
         SDValue Mask = CurDAG->getConstant(0xff, N.getValueType());

diff --git a/test/CodeGen/X86/2009-04-scale.ll b/test/CodeGen/X86/2009-04-scale.ll
new file mode 100644 (file)
index 0000000..0766dc7
--- /dev/null
+++ b/test/CodeGen/X86/2009-04-scale.ll
@@ -0,0 +1,23 @@
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i386-unknown-linux-gnu
+; PR3995
+
+        %struct.vtable = type { i32 (...)** }
+       %struct.array = type { %struct.impl, [256 x %struct.pair], [256 x %struct.pair], [256 x %struct.pair], [256 x %struct.pair], [256 x %struct.pair], [256 x %struct.pair] }
+       %struct.impl = type { %struct.vtable, i8, %struct.impl*, i32, i32, i64, i64 }
+       %struct.pair = type { i64, i64 }
+
+define void @test() {
+entry:
+       %0 = load i32* null, align 4            ; <i32> [#uses=1]
+       %1 = lshr i32 %0, 8             ; <i32> [#uses=1]
+       %2 = and i32 %1, 255            ; <i32> [#uses=1]
+       %3 = getelementptr %struct.array* null, i32 0, i32 3            ; <[256 x %struct.pair]*> [#uses=1]
+       %4 = getelementptr [256 x %struct.pair]* %3, i32 0, i32 %2              ; <%struct.pair*> [#uses=1]
+       %5 = getelementptr %struct.pair* %4, i32 0, i32 1               ; <i64*> [#uses=1]
+       %6 = load i64* %5, align 4              ; <i64> [#uses=1]
+       %7 = xor i64 0, %6              ; <i64> [#uses=1]
+       %8 = xor i64 %7, 0              ; <i64> [#uses=1]
+       %9 = xor i64 %8, 0              ; <i64> [#uses=1]
+       store i64 %9, i64* null, align 8
+       unreachable
+}