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

[Bill Wendling]

Author: void
Date: Tue Jan 11 13:26:48 2011
New Revision: 123255

URL: http://llvm.org/viewvc/llvm-project?rev=123255&view=rev
Log:
$ svn merge -c 119819 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r119819 into '.':
A    test/CodeGen/X86/bc-extract.ll
U    lib/CodeGen/SelectionDAG/SelectionDAG.cpp


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

Propchange: llvm/branches/Apple/Hartnell/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 11 13:26:48 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Morbo:102475
-/llvm/trunk:104174-104175,105453,107846,108367,109519,109549,110987
+/llvm/trunk:104174-104175,105453,107846,108367,109519,109549,110987,119819

Modified: llvm/branches/Apple/Hartnell/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hartnell/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=123255&r1=123254&r2=123255&view=diff
==============================================================================
--- llvm/branches/Apple/Hartnell/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/branches/Apple/Hartnell/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Tue Jan 11 13:26:48 2011
@@ -199,6 +199,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)