diff options
| author | Dan Gohman <gohman@apple.com> | 2008-11-03 23:43:55 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-11-03 23:43:55 +0000 |
| commit | f6503a031e2459be63ebc688d32577d9f70da354 (patch) | |
| tree | 0868bdd1aefddebe9623405d2f2eeeb78735affa | |
| parent | b6dc9352b0d8361609c310699ce58a517fdc2264 (diff) | |
The ANDMask node folds to a constant, and isn't the node that needs to
have its node id set. The new and and shift nodes are the nodes that need
the IDs. This fixes PR2982.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58655 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86ISelDAGToDAG.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGen/X86/pr2982.ll | 26 |
2 files changed, 28 insertions, 2 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index c341980978..7ba62189ca 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -993,8 +993,8 @@ bool X86DAGToDAGISel::MatchAddress(SDValue N, X86ISelAddressMode &AM, Shift.getOperand(0), NewANDMask); SDValue NewSHIFT = CurDAG->getNode(ISD::SHL, N.getValueType(), NewAND, SDValue(C1, 0)); - NewANDMask.getNode()->setNodeId(Shift.getNode()->getNodeId()); - NewAND.getNode()->setNodeId(N.getNode()->getNodeId()); + NewAND.getNode()->setNodeId(Shift.getNode()->getNodeId()); + NewSHIFT.getNode()->setNodeId(N.getNode()->getNodeId()); CurDAG->ReplaceAllUsesWith(N, NewSHIFT); AM.Scale = 1 << ShiftCst; diff --git a/test/CodeGen/X86/pr2982.ll b/test/CodeGen/X86/pr2982.ll new file mode 100644 index 0000000000..f5dc1f4b9a --- /dev/null +++ b/test/CodeGen/X86/pr2982.ll @@ -0,0 +1,26 @@ +; RUN: llvm-as < %s | llc -march=x86 +; PR2982 + +target datalayout = +"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "i386-apple-darwin9.5" +@g_279 = external global i32 ; <i32*> [#uses=1] +@g_265 = external global i32 ; <i32*> [#uses=1] +@g_3 = external global i8 ; <i8*> [#uses=1] + +declare i32 @rshift_u_u(...) + +define void @bar() nounwind { +entry: + %0 = load i32* @g_279, align 4 ; <i32> [#uses=1] + %1 = shl i32 %0, 1 ; <i32> [#uses=1] + %2 = and i32 %1, 2 ; <i32> [#uses=1] + %3 = load i32* @g_265, align 4 ; <i32> [#uses=1] + %4 = load i8* @g_3, align 1 ; <i8> [#uses=1] + %5 = sext i8 %4 to i32 ; <i32> [#uses=1] + %6 = add i32 %2, %3 ; <i32> [#uses=1] + %7 = add i32 %6, %5 ; <i32> [#uses=1] + %8 = tail call i32 (...)* @rshift_u_u(i32 %7, i32 0) nounwind +; <i32> [#uses=0] + ret void +} |