diff options
author | Torok Edwin <edwintorok@gmail.com> | 2009-07-12 20:07:01 +0000 |
---|---|---|
committer | Torok Edwin <edwintorok@gmail.com> | 2009-07-12 20:07:01 +0000 |
commit | f36892335b4919b9120e48a792e6b3630b9de978 (patch) | |
tree | 7a5c22e5311a5e53602a173130e75a607bb1301b /lib | |
parent | 614be08dd6ae0755d8a4c32ad49f5f580602cc78 (diff) | |
download | external_llvm-f36892335b4919b9120e48a792e6b3630b9de978.zip external_llvm-f36892335b4919b9120e48a792e6b3630b9de978.tar.gz external_llvm-f36892335b4919b9120e48a792e6b3630b9de978.tar.bz2 |
Fix assert(0) conversion, as suggested by Chris.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75423 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CodeGen/IfConversion.cpp | 16 | ||||
-rw-r--r-- | lib/CodeGen/PreAllocSplitting.cpp | 5 | ||||
-rw-r--r-- | lib/CodeGen/RegisterScavenging.cpp | 5 | ||||
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 13 |
4 files changed, 19 insertions, 20 deletions
diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp index 739c06b..02249c9 100644 --- a/lib/CodeGen/IfConversion.cpp +++ b/lib/CodeGen/IfConversion.cpp @@ -1132,10 +1132,10 @@ void IfConverter::PredicateBlock(BBInfo &BBI, if (TII->isPredicated(I)) continue; if (!TII->PredicateInstruction(I, Cond)) { - std::string msg; - raw_string_ostream Msg(msg); - Msg << "Unable to predicate " << *I << "!"; - llvm_report_error(Msg.str()); +#ifndef NDEBUG + cerr << "Unable to predicate " << *I << "!\n"; +#endif + llvm_unreachable(); } } @@ -1168,10 +1168,10 @@ void IfConverter::CopyAndPredicateBlock(BBInfo &ToBBI, BBInfo &FromBBI, if (!isPredicated) if (!TII->PredicateInstruction(MI, Cond)) { - std::string msg; - raw_string_ostream Msg(msg); - Msg << "Unable to predicate " << *MI << "!"; - llvm_report_error(Msg.str()); +#ifndef NDEBUG + cerr << "Unable to predicate " << *I << "!\n"; +#endif + llvm_unreachable(); } } diff --git a/lib/CodeGen/PreAllocSplitting.cpp b/lib/CodeGen/PreAllocSplitting.cpp index 52a403b..c49575b 100644 --- a/lib/CodeGen/PreAllocSplitting.cpp +++ b/lib/CodeGen/PreAllocSplitting.cpp @@ -1035,10 +1035,7 @@ bool PreAllocSplitting::SplitRegLiveInterval(LiveInterval *LI) { CurrLI->FindLiveRangeContaining(LIs->getUseIndex(BarrierIdx)); VNInfo *ValNo = LR->valno; - if (ValNo->isUnused()) { - // Defined by a dead def? How can this be? - LLVM_UNREACHABLE("Val# is defined by a dead def?"); - } + assert(!ValNo->isUnused() && "Val# is defined by a dead def?"); MachineInstr *DefMI = ValNo->isDefAccurate() ? LIs->getInstructionFromIndex(ValNo->def) : NULL; diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp index ab9a0e3..84cff8d 100644 --- a/lib/CodeGen/RegisterScavenging.cpp +++ b/lib/CodeGen/RegisterScavenging.cpp @@ -459,9 +459,8 @@ unsigned RegScavenger::scavengeRegister(const TargetRegisterClass *RC, Reg = Candidates.find_next(Reg); } - if (ScavengedReg != 0) { - LLVM_UNREACHABLE("Scavenger slot is live, unable to scavenge another register!"); - } + assert(ScavengedReg == 0 && + "Scavenger slot is live, unable to scavenge another register!"); // Spill the scavenged register before I. TII->storeRegToStackSlot(*MBB, I, SReg, true, ScavengingFrameIndex, RC); diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index b084ab7..6d7c9c0 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -152,9 +152,12 @@ namespace llvm { // basic blocks, and the scheduler passes ownership of it to this method. MachineBasicBlock *TargetLowering::EmitInstrWithCustomInserter(MachineInstr *MI, MachineBasicBlock *MBB) const { - llvm_report_error("If a target marks an instruction with " - "'usesCustomDAGSchedInserter', it must implement " - "TargetLowering::EmitInstrWithCustomInserter!"); +#ifndef NDEBUG + cerr << "If a target marks an instruction with " + "'usesCustomDAGSchedInserter', it must implement " + "TargetLowering::EmitInstrWithCustomInserter!"; +#endif + llvm_unreachable(); return 0; } @@ -831,8 +834,8 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, cerr << "FastISel miss: "; BI->dump(); } - if (EnableFastISelAbort) - LLVM_UNREACHABLE("FastISel didn't handle a PHI in a successor"); + assert(!EnableFastISelAbort && + "FastISel didn't handle a PHI in a successor"); break; } |