diff options
| author | Richard Barton <richard.barton@arm.com> | 2012-06-27 09:36:19 +0000 |
|---|---|---|
| committer | Richard Barton <richard.barton@arm.com> | 2012-06-27 09:36:19 +0000 |
| commit | 4b7558ef9a911015a78548822b21154fda57f372 (patch) | |
| tree | a655c50b258a1eccb864e0c7cd8bc03c5e64155e /llvm/lib/Target | |
| parent | 38179d96930691fbc8ef95e68f525bbeeeb9cf62 (diff) | |
| download | bcm5719-llvm-4b7558ef9a911015a78548822b21154fda57f372.tar.gz bcm5719-llvm-4b7558ef9a911015a78548822b21154fda57f372.zip | |
Prevent ARM Assembler crashing on unrecognised assembly format for DSB instruction
llvm-svn: 159257
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index d375e357aea..830e9c0b3b7 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -3256,7 +3256,8 @@ ARMAsmParser::OperandMatchResultTy ARMAsmParser:: parseMemBarrierOptOperand(SmallVectorImpl<MCParsedAsmOperand*> &Operands) { SMLoc S = Parser.getTok().getLoc(); const AsmToken &Tok = Parser.getTok(); - assert(Tok.is(AsmToken::Identifier) && "Token is not an Identifier"); + if (!Tok.is(AsmToken::Identifier)) + return MatchOperand_NoMatch; StringRef OptStr = Tok.getString(); unsigned Opt = StringSwitch<unsigned>(OptStr.slice(0, OptStr.size())) |
