[llvm-commits] [llvm] r45773 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp

[Owen Anderson]

Author: resistor
Date: Wed Jan  9 00:19:05 2008
New Revision: 45773

URL: http://llvm.org/viewvc/llvm-project?rev=45773&view=rev
Log:
Fix some simple bugs.  StrongPHIElimination now does not crash on 164.gzip.

Modified:
    llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp

Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=45773&r1=45772&r2=45773&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original)
+++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Wed Jan  9 00:19:05 2008
@@ -178,7 +178,6 @@
     else if (preorder[ABlock] > preorder[BBlock])
       return false;
     
-    assert(0 && "Error sorting by dominance!");
     return false;
   }
 };
@@ -208,8 +207,9 @@
   for (std::vector<unsigned>::iterator I = worklist.begin(), E = worklist.end();
        I != E; ++I) {
     unsigned pre = preorder[LV.getVarInfo(*I).DefInst->getParent()];
-    MachineBasicBlock* parentBlock =
-      LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent();
+    MachineBasicBlock* parentBlock = CurrentParent->getReg() ?
+                 LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent() :
+                 0;
     
     while (pre > maxpreorder[parentBlock]) {
       stack.pop_back();