Fix a tokenfactor node to use the load chain rather than the

load value. This fixes PR2177.

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

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index aea57f2529a8460d546342dca732708a3ba0c264..6cbae42839ea4b918c7faf6825372a6720624b59 100644 (file)
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -6021,7 +6021,7 @@ static SDOperand PerformSTORECombine(StoreSDNode *St, SelectionDAG &DAG,
                                       Ld->getAlignment());
         SDOperand NewChain = NewLd.getValue(1);
         if (TokenFactorIndex != -1) {
-          Ops.push_back(NewLd);
+          Ops.push_back(NewChain);
           NewChain = DAG.getNode(ISD::TokenFactor, MVT::Other, &Ops[0], 
                                  Ops.size());
         }

diff --git a/test/CodeGen/X86/pr2177.ll b/test/CodeGen/X86/pr2177.ll
new file mode 100644 (file)
index 0000000..b03c990
--- /dev/null
+++ b/test/CodeGen/X86/pr2177.ll
@@ -0,0 +1,35 @@
+; RUN: llvm-as < %s | llc
+; PR2177
+
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"
+target triple = "x86_64-apple-darwin9.1.0"
+       %struct.S2259 = type { <4 x i16>, i8, i64 }
+
+define void @check2259va(i32 %z, ...) {
+entry:
+       br i1 false, label %bb5, label %return
+bb5:           ; preds = %entry
+       switch i32 0, label %bb155 [
+                i32 16, label %bb10
+                i32 17, label %bb118
+                i32 18, label %bb54
+                i32 32, label %bb118
+                i32 33, label %bb118
+                i32 36, label %bb118
+       ]
+bb10:          ; preds = %bb5
+       ret void
+bb54:          ; preds = %bb5
+       ret void
+bb118:         ; preds = %bb5, %bb5, %bb5, %bb5
+       %tmp125 = load i8** null, align 8               ; <i8*> [#uses=1]
+       %tmp125126 = bitcast i8* %tmp125 to %struct.S2259*              ; <%struct.S2259*> [#uses=1]
+       %tmp128 = getelementptr %struct.S2259* %tmp125126, i32 0, i32 0         ; <<4 x i16>*> [#uses=1]
+       %tmp129 = load <4 x i16>* %tmp128, align 8              ; <<4 x i16>> [#uses=1]
+       store <4 x i16> %tmp129, <4 x i16>* null, align 8
+       ret void
+bb155:         ; preds = %bb5
+       ret void
+return:                ; preds = %entry
+       ret void
+}