[llvm-branch-commits] [llvm-branch] r122068 - in /llvm/branches/Apple/Morbo: lib/CodeGen/SelectionDAG/SelectionDAG.cpp test/CodeGen/X86/bc-extract.ll

[Stuart Hastings]

Author: stuart
Date: Fri Dec 17 11:53:38 2010
New Revision: 122068

URL: http://llvm.org/viewvc/llvm-project?rev=122068&view=rev
Log:
Merge r119819 into Morbo.  Radar 8640367.

Added:
    llvm/branches/Apple/Morbo/test/CodeGen/X86/bc-extract.ll
      - copied unchanged from r119819, llvm/trunk/test/CodeGen/X86/bc-extract.ll
Modified:
    llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=122068&r1=122067&r2=122068&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Fri Dec 17 11:53:38 2010
@@ -197,6 +197,8 @@
   if (N->getOperand(0).getOpcode() == ISD::UNDEF)
     return false;
   unsigned NumElems = N->getNumOperands();
+  if (NumElems == 1)
+    return false;
   for (unsigned i = 1; i < NumElems; ++i) {
     SDValue V = N->getOperand(i);
     if (V.getOpcode() != ISD::UNDEF)