summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorDavide Italiano <davide@freebsd.org>2015-11-21 05:49:07 +0000
committerDavide Italiano <davide@freebsd.org>2015-11-21 05:49:07 +0000
commitebb27afe31fe7f8faa83934632cd838d387cc2c2 (patch)
tree5605b68c751a0d54aee34857746ec20ce517728a /llvm
parent78da7598b4efe09ca5bc3a9417b57d4bc27d96c5 (diff)
downloadbcm5719-llvm-ebb27afe31fe7f8faa83934632cd838d387cc2c2.tar.gz
bcm5719-llvm-ebb27afe31fe7f8faa83934632cd838d387cc2c2.zip
[llvm-rtdyld] Turn assertion into errors, it seems more appropriate.
llvm-svn: 253766
Diffstat (limited to 'llvm')
-rw-r--r--llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index 689fb101f9c..d0e4a447269 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -610,19 +610,23 @@ static int linkAndVerify() {
std::unique_ptr<MCSubtargetInfo> STI(
TheTarget->createMCSubtargetInfo(TripleName, MCPU, ""));
- assert(STI && "Unable to create subtarget info!");
+ if (!STI)
+ return Error("Unable to create subtarget info!");
std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TripleName));
- assert(MRI && "Unable to create target register info!");
+ if (!MRI)
+ return Error("Unable to create target register info!");
std::unique_ptr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, TripleName));
- assert(MAI && "Unable to create target asm info!");
+ if (!MAI)
+ return Error("Unable to create target asm info!");
MCContext Ctx(MAI.get(), MRI.get(), nullptr);
std::unique_ptr<MCDisassembler> Disassembler(
TheTarget->createMCDisassembler(*STI, Ctx));
- assert(Disassembler && "Unable to create disassembler!");
+ if (!Disassembler)
+ return Error("Unable to create disassembler!");
std::unique_ptr<MCInstrInfo> MII(TheTarget->createMCInstrInfo());
OpenPOWER on IntegriCloud