[llvm-commits] [llvm] r55977 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

[Dan Gohman]

Author: djg
Date: Mon Sep  8 21:40:04 2008
New Revision: 55977

URL: http://llvm.org/viewvc/llvm-project?rev=55977&view=rev
Log:
Remove the code that protected FastISel from aborting in
the case of loads, stores, and conditional branches. It can
handle those now, so any that aren't handled should trigger
the abort.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=55977&r1=55976&r2=55977&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Sep  8 21:40:04 2008
@@ -760,8 +760,7 @@
             continue;
 
           // Then handle certain instructions as single-LLVM-Instruction blocks.
-          if (isa<CallInst>(BI) || isa<LoadInst>(BI) ||
-              isa<StoreInst>(BI)) {
+          if (isa<CallInst>(BI)) {
             if (BI->getType() != Type::VoidTy) {
               unsigned &R = FuncInfo->ValueMap[BI];
               if (!R)
@@ -774,9 +773,7 @@
 
           if (!DisableFastISelAbort &&
               // For now, don't abort on non-conditional-branch terminators.
-              (!isa<TerminatorInst>(BI) ||
-               (isa<BranchInst>(BI) &&
-                cast<BranchInst>(BI)->isUnconditional()))) {
+              (!isa<TerminatorInst>(BI) || isa<BranchInst>(BI))) {
             // The "fast" selector couldn't handle something and bailed.
             // For the purpose of debugging, just abort.
 #ifndef NDEBUG