diff options
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 9 | ||||
| -rw-r--r-- | test/MC/MachO/bad-dollar.s | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 7d4b4d887d..b5f51d8484 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -734,7 +734,9 @@ bool AsmParser::ParseBracketExpr(const MCExpr *&Res, SMLoc &EndLoc) { /// primaryexpr ::= '.' /// primaryexpr ::= ~,+,- primaryexpr bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) { - switch (Lexer.getKind()) { + SMLoc FirstTokenLoc = getLexer().getLoc(); + AsmToken::TokenKind FirstTokenKind = Lexer.getKind(); + switch (FirstTokenKind) { default: return TokError("unknown token in expression"); // If we have an error assume that we've already handled it. @@ -750,8 +752,11 @@ bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) { case AsmToken::String: case AsmToken::Identifier: { StringRef Identifier; - if (ParseIdentifier(Identifier)) + if (ParseIdentifier(Identifier)) { + if (FirstTokenKind == AsmToken::Dollar) + return Error(FirstTokenLoc, "invalid token in expression"); return true; + } EndLoc = SMLoc::getFromPointer(Identifier.end()); diff --git a/test/MC/MachO/bad-dollar.s b/test/MC/MachO/bad-dollar.s new file mode 100644 index 0000000000..fd72ed0230 --- /dev/null +++ b/test/MC/MachO/bad-dollar.s @@ -0,0 +1,5 @@ +// RUN: not llvm-mc -triple x86_64-apple-darwin10 %s 2> %t.err > %t +// RUN: FileCheck --check-prefix=CHECK-ERROR < %t.err %s + +.long $1 +// CHECK-ERROR: 4:7: error: invalid token in expression |