diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-08-01 00:59:22 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-08-01 00:59:22 +0000 |
commit | 71ff3f223f96a8ec2aa766144daddc18c5a1c062 (patch) | |
tree | ff9cc8f9f17817c11a585817b1dced17c3b786d7 | |
parent | b4a313a76f8cff741388ae652bb64c4fbe489051 (diff) | |
download | bcm5719-llvm-71ff3f223f96a8ec2aa766144daddc18c5a1c062.tar.gz bcm5719-llvm-71ff3f223f96a8ec2aa766144daddc18c5a1c062.zip |
MS inline asm: Fix null SMLoc when 'ptr' is missing after dword & co
This improves the diagnostics from the regular assembler, but more
importantly it fixes an assertion when parsing inline assembly. Test
landing in Clang.
llvm-svn: 214468
-rw-r--r-- | llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index 85de47be091..bc13ed6704b 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -1550,7 +1550,7 @@ std::unique_ptr<X86Operand> X86AsmParser::ParseIntelOperand() { if (Size) { Parser.Lex(); // Eat operand size (e.g., byte, word). if (Tok.getString() != "PTR" && Tok.getString() != "ptr") - return ErrorOperand(Start, "Expected 'PTR' or 'ptr' token!"); + return ErrorOperand(Tok.getLoc(), "Expected 'PTR' or 'ptr' token!"); Parser.Lex(); // Eat ptr. } Start = Tok.getLoc(); |