[llvm-branch-commits] [llvm-branch] r90486 - in /llvm/branches/Apple/Zoidberg/lib/CodeGen: PostRASchedulerList.cpp SelectionDAG/DAGCombiner.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Thu Dec  3 15:46:42 2009
New Revision: 90486

URL: http://llvm.org/viewvc/llvm-project?rev=90486&view=rev
Log:
Merge 90381, 90415

Modified:
    llvm/branches/Apple/Zoidberg/lib/CodeGen/PostRASchedulerList.cpp
    llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/CodeGen/PostRASchedulerList.cpp?rev=90486&r1=90485&r2=90486&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/PostRASchedulerList.cpp Thu Dec  3 15:46:42 2009
@@ -510,12 +510,9 @@
       }
       
       if (MO.isKill() != kill) {
-        bool removed = ToggleKillFlag(MI, MO);
-        if (removed) {
-          DEBUG(errs() << "Fixed <removed> in ");
-        } else {
-          DEBUG(errs() << "Fixed " << MO << " in ");
-        }
+        DEBUG(errs() << "Fixing " << MO << " in ");
+        // Warning: ToggleKillFlag may invalidate MO.
+        ToggleKillFlag(MI, MO);
         DEBUG(MI->dump());
       }
       

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=90486&r1=90485&r2=90486&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Thu Dec  3 15:46:42 2009
@@ -546,7 +546,8 @@
         To[0].getNode()->dump(&DAG);
         errs() << " and " << NumTo-1 << " other values\n";
         for (unsigned i = 0, e = NumTo; i != e; ++i)
-          assert(N->getValueType(i) == To[i].getValueType() &&
+          assert((!To[i].getNode() ||
+                  N->getValueType(i) == To[i].getValueType()) &&
                  "Cannot combine value to value of different type!"));
   WorkListRemover DeadNodes(*this);
   DAG.ReplaceAllUsesWith(N, To, &DeadNodes);