[llvm-commits] [llvm] r58655 - in /llvm/trunk: lib/Target/X86/X86ISelDAGToDAG.cpp test/CodeGen/X86/pr2982.ll

[Dan Gohman]

Author: djg
Date: Mon Nov  3 17:43:55 2008
New Revision: 58655

URL: http://llvm.org/viewvc/llvm-project?rev=58655&view=rev
Log:
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.

Added:
    llvm/trunk/test/CodeGen/X86/pr2982.ll
Modified:
    llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=58655&r1=58654&r2=58655&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Nov  3 17:43:55 2008
@@ -993,8 +993,8 @@
                                      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;

Added: llvm/trunk/test/CodeGen/X86/pr2982.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr2982.ll?rev=58655&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/pr2982.ll (added)
+++ llvm/trunk/test/CodeGen/X86/pr2982.ll Mon Nov  3 17:43:55 2008
@@ -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"
+ at g_279 = external global i32            ; <i32*> [#uses=1]
+ at g_265 = external global i32            ; <i32*> [#uses=1]
+ at 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
+}