summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC/MCParser/AsmParser.cpp
diff options
context:
space:
mode:
authorAhmed Bougacha <ahmed.bougacha@gmail.com>2017-08-10 21:23:00 +0000
committerAhmed Bougacha <ahmed.bougacha@gmail.com>2017-08-10 21:23:00 +0000
commita24e4cda006772f27a3b484959207ef1d34e2056 (patch)
treeff97892ae7d76215b81f4d2b336150c1a97326be /llvm/lib/MC/MCParser/AsmParser.cpp
parent8d4d57035fd50c36d050585d22b50171c49fc6d9 (diff)
downloadbcm5719-llvm-a24e4cda006772f27a3b484959207ef1d34e2056.tar.gz
bcm5719-llvm-a24e4cda006772f27a3b484959207ef1d34e2056.zip
Revert "[AsmParser] Hash is not a comment on some targets"
This reverts commit r310457. It causes clang-produced IR to fail llvm codegen. llvm-svn: 310662
Diffstat (limited to 'llvm/lib/MC/MCParser/AsmParser.cpp')
-rw-r--r--llvm/lib/MC/MCParser/AsmParser.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index b0f6a4cd501..a75476d2298 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -1648,6 +1648,16 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
Lex();
return false;
}
+ if (Lexer.is(AsmToken::Hash)) {
+ // Seeing a hash here means that it was an end-of-line comment in
+ // an asm syntax where hash's are not comment and the previous
+ // statement parser did not check the end of statement. Relex as
+ // EndOfStatement.
+ StringRef CommentStr = parseStringToEndOfStatement();
+ Lexer.Lex();
+ Lexer.UnLex(AsmToken(AsmToken::EndOfStatement, CommentStr));
+ return false;
+ }
// Statements always start with an identifier.
AsmToken ID = getTok();
SMLoc IDLoc = ID.getLoc();
OpenPOWER on IntegriCloud