From b6aef419b4966bf69a0754b44b91ab3f066b7361 Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Tue, 9 Sep 2008 02:40:04 +0000
Subject: [PATCH] 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.

llvm-svn: 55977
---
 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 344b91cf82c9..a2716c2706c8 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -760,8 +760,7 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF) {
             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 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, MachineFunction &MF) {
 
           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