aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCDisassembler/Disassembler.cpp
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2013-05-23 00:32:34 +0000
committerKevin Enderby <enderby@apple.com>2013-05-23 00:32:34 +0000
commit64d934507ee6d4f603628f1dbab26a5df58bc7e0 (patch)
tree29fa8ee6a67c16e1417b39e0ef8dd73ae6adb669 /llvm/lib/MC/MCDisassembler/Disassembler.cpp
parenta23ab514c2a126bcdfd30f3edaf4da6800bcd534 (diff)
downloadllvm-64d934507ee6d4f603628f1dbab26a5df58bc7e0.zip
llvm-64d934507ee6d4f603628f1dbab26a5df58bc7e0.tar.gz
llvm-64d934507ee6d4f603628f1dbab26a5df58bc7e0.tar.bz2
Missed removing one of the assert()'s from the LLVMCreateDisasmCPU() library
API with my 176880 revision. If a bad Triple is passed in it can also assert. In this case too it should just return 0 to indicate failure to create the disassembler. rdar://13955214 llvm-svn: 182542
Diffstat (limited to 'llvm/lib/MC/MCDisassembler/Disassembler.cpp')
-rw-r--r--llvm/lib/MC/MCDisassembler/Disassembler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCDisassembler/Disassembler.cpp b/llvm/lib/MC/MCDisassembler/Disassembler.cpp
index d3c0192..c80a167 100644
--- a/llvm/lib/MC/MCDisassembler/Disassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/Disassembler.cpp
@@ -40,7 +40,8 @@ LLVMDisasmContextRef LLVMCreateDisasmCPU(const char *Triple, const char *CPU,
// Get the target.
std::string Error;
const Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error);
- assert(TheTarget && "Unable to create target!");
+ if (!TheTarget)
+ return 0;
const MCRegisterInfo *MRI = TheTarget->createMCRegInfo(Triple);
if (!MRI)