summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2013-04-19 17:31:39 +0000
committerChad Rosier <mcrosier@apple.com>2013-04-19 17:31:39 +0000
commit103fe730ab1ce5a943195db7997b42d9e9d7a0c7 (patch)
treee0ae27987bd4a9eb46a6cd2c2ba3251899331e78
parent9172520f57a33e6accbce5d10930dea93869a0f0 (diff)
downloadbcm5719-llvm-103fe730ab1ce5a943195db7997b42d9e9d7a0c7.tar.gz
bcm5719-llvm-103fe730ab1ce5a943195db7997b42d9e9d7a0c7.zip
[ms-inline asm] Make this a hard error.
llvm-svn: 179865
-rw-r--r--llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 4418a3c5e22..2fbfe269708 100644
--- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -1404,10 +1404,10 @@ X86Operand *X86AsmParser::ParseIntelMemOperand(unsigned SegReg,
unsigned Size = getIntelMemOperandSize(Tok.getString());
if (Size) {
- Parser.Lex();
- assert ((Tok.getString() == "PTR" || Tok.getString() == "ptr") &&
- "Unexpected token!");
- Parser.Lex();
+ Parser.Lex(); // Eat operand size (e.g., byte, word).
+ if (Tok.getString() != "PTR" && Tok.getString() != "ptr")
+ return ErrorOperand(Start, "Expected 'PTR' or 'ptr' token!");
+ Parser.Lex(); // Eat ptr.
}
// Parse ImmDisp [ BaseReg + Scale*IndexReg + Disp ].
OpenPOWER on IntegriCloud