[llvm-branch-commits] [llvm-branch] r92798 - in /llvm/branches/Apple/Zoidberg: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/2010-01-05-ZExt-Shl.ll

[Bill Wendling]

Author: void
Date: Tue Jan  5 16:40:30 2010
New Revision: 92798

URL: http://llvm.org/viewvc/llvm-project?rev=92798&view=rev
Log:
$ svn merge -c 92797 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r92797 into '.':
A    test/CodeGen/X86/2010-01-05-ZExt-Shl.ll
U    lib/CodeGen/SelectionDAG/DAGCombiner.cpp


Added:
    llvm/branches/Apple/Zoidberg/test/CodeGen/X86/2010-01-05-ZExt-Shl.ll
      - copied unchanged from r92797, llvm/trunk/test/CodeGen/X86/2010-01-05-ZExt-Shl.ll
Modified:
    llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=92798&r1=92797&r2=92798&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Tue Jan  5 16:40:30 2010
@@ -3295,7 +3295,9 @@
     DebugLoc dl = N->getDebugLoc();
     return DAG.getNode(N0.getOpcode(), dl, VT,
                        DAG.getNode(ISD::ZERO_EXTEND, dl, VT, N0.getOperand(0)),
-                       DAG.getNode(ISD::ZERO_EXTEND, dl, VT, N0.getOperand(1)));
+                       DAG.getNode(ISD::ZERO_EXTEND, dl,
+                                   N0.getOperand(1).getValueType(),
+                                   N0.getOperand(1)));
   }
 
   return SDValue();