From 4df7c24e069c5a2c59afda288cdcc8565102eb9f Mon Sep 17 00:00:00 2001 From: Torok Edwin Date: Wed, 8 Jul 2009 20:55:50 +0000 Subject: [PATCH] Missed an exit during the conversion. Will convert assert(0) that don't have abort() to LLVM_UNREACHABLE in a later commit. llvm-svn: 75045 --- lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp | 8 ++++---- lib/Target/CppBackend/CPPBackend.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index 532e3cc4d6c..c4deb4bdb39 100644 --- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -35,6 +35,7 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/Compiler.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Mangler.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" @@ -209,7 +210,7 @@ bool ARMAsmPrinter::runOnMachineFunction(MachineFunction &MF) { // Print out labels for the function. const Function *F = MF.getFunction(); switch (F->getLinkage()) { - default: assert(0 && "Unknown linkage type!"); + default: LLVM_UNREACHABLE("Unknown linkage type!"); case Function::PrivateLinkage: case Function::InternalLinkage: SwitchToTextSection("\t.text", F); @@ -306,7 +307,7 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int OpNum, O << TRI->getAsmName(Reg); } } else - assert(0 && "not implemented"); + LLVM_UNREACHABLE("not implemented"); break; } case MachineOperand::MO_Immediate: { @@ -1113,8 +1114,7 @@ void ARMAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) { case GlobalValue::InternalLinkage: break; default: - assert(0 && "Unknown linkage type!"); - break; + LLVM_UNREACHABLE("Unknown linkage type!"); } EmitAlignment(Align, GVar); diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index 28f58e86f62..6c48ae8d270 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -28,6 +28,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Streams.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Config/config.h" @@ -220,8 +221,7 @@ namespace { } void CppWriter::error(const std::string& msg) { - cerr << msg << "\n"; - exit(2); + llvm_report_error(msg); } // printCFP - Print a floating point constant .. very carefully :)