[llvm-branch-commits] [llvm-branch] r93593 - in /llvm/branches/Apple/Zoidberg: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/br-fold.ll

[Bill Wendling]

Author: void
Date: Fri Jan 15 18:18:06 2010
New Revision: 93593

URL: http://llvm.org/viewvc/llvm-project?rev=93593&view=rev
Log:
$ svn merge -c 93417 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r93417 into '.':
A    test/CodeGen/X86/br-fold.ll
U    lib/CodeGen/SelectionDAG/DAGCombiner.cpp


Added:
    llvm/branches/Apple/Zoidberg/test/CodeGen/X86/br-fold.ll
      - copied unchanged from r93417, llvm/trunk/test/CodeGen/X86/br-fold.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=93593&r1=93592&r2=93593&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Fri Jan 15 18:18:06 2010
@@ -1684,6 +1684,9 @@
   EVT VT = N0.getValueType();
   assert(N0.getOpcode() == N1.getOpcode() && "Bad input!");
 
+  // Bail early if none of these transforms apply.
+  if (N0.getNode()->getNumOperands() == 0) return SDValue();
+
   // For each of OP in AND/OR/XOR:
   // fold (OP (zext x), (zext y)) -> (zext (OP x, y))
   // fold (OP (sext x), (sext y)) -> (sext (OP x, y))