diff options
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 3 | ||||
| -rw-r--r-- | test/MC/AsmParser/line_with_hash.s | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 4cb4290d82..16487579ab 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -1225,7 +1225,8 @@ bool AsmParser::ParseStatement() { /// EatToEndOfLine uses the Lexer to eat the characters to the end of the line /// since they may not be able to be tokenized to get to the end of line token. void AsmParser::EatToEndOfLine() { - Lexer.LexUntilEndOfLine(); + if (!Lexer.is(AsmToken::EndOfStatement)) + Lexer.LexUntilEndOfLine(); // Eat EOL. Lex(); } diff --git a/test/MC/AsmParser/line_with_hash.s b/test/MC/AsmParser/line_with_hash.s new file mode 100644 index 0000000000..6fdab400f3 --- /dev/null +++ b/test/MC/AsmParser/line_with_hash.s @@ -0,0 +1,15 @@ +# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s + +// We used to incorrectly parse a line with only a # in it + +.zero 42 +# +.ifndef FOO +.zero 2 +.else +.endif +.zero 24 + +// CHECK: .zero 42 +// CHECK-NEXT: .zero 2 +// CHECK-NEXT: .zero 24 |