summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRichard Barton <richard.barton@arm.com>2012-06-27 09:36:19 +0000
committerRichard Barton <richard.barton@arm.com>2012-06-27 09:36:19 +0000
commitb69182095ce19c07a7207ab546f61bffc5111d8e (patch)
tree921adb3c2293e3a9d3e706620735ded98a70c39f /lib
parent7d85f87acb4d46cfd315a08f6f64b23818eb47e4 (diff)
downloadllvm-b69182095ce19c07a7207ab546f61bffc5111d8e.tar.gz
llvm-b69182095ce19c07a7207ab546f61bffc5111d8e.tar.bz2
llvm-b69182095ce19c07a7207ab546f61bffc5111d8e.tar.xz
Prevent ARM Assembler crashing on unrecognised assembly format for DSB instruction
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159257 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/ARM/AsmParser/ARMAsmParser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index d375e357ae..830e9c0b3b 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/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()))