[llvm] r277468 - Revert "[MC] Fix handling of end-of-line preprocessor comments"
Nirav Dave via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 2 08:08:52 PDT 2016
Author: niravd
Date: Tue Aug 2 10:08:52 2016
New Revision: 277468
URL: http://llvm.org/viewvc/llvm-project?rev=277468&view=rev
Log:
Revert "[MC] Fix handling of end-of-line preprocessor comments"
Causes TSan failure on PPC64
This reverts commit r277459.
Removed:
llvm/trunk/test/MC/ARM/preserve-comments-arm.s
Modified:
llvm/trunk/lib/MC/MCParser/AsmParser.cpp
Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=277468&r1=277467&r2=277468&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Aug 2 10:08:52 2016
@@ -262,23 +262,9 @@ public:
return false;
}
- bool parseEOL(const Twine &ErrMsg) {
- if (getTok().getKind() == AsmToken::Hash) {
- StringRef CommentStr = parseStringToEndOfStatement();
- Lexer.Lex();
- Lexer.UnLex(AsmToken(AsmToken::EndOfStatement, CommentStr));
- }
- if (getTok().getKind() != AsmToken::EndOfStatement)
- return TokError(ErrMsg);
- Lex();
- return false;
- }
-
/// parseToken - If current token has the specified kind, eat it and
/// return success. Otherwise, emit the specified error and return failure.
bool parseToken(AsmToken::TokenKind T, const Twine &ErrMsg) {
- if (T == AsmToken::EndOfStatement)
- return parseEOL(ErrMsg);
if (getTok().getKind() != T)
return TokError(ErrMsg);
Lex();
@@ -1423,16 +1409,6 @@ bool AsmParser::parseStatement(ParseStat
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();
@@ -1566,16 +1542,6 @@ bool AsmParser::parseStatement(ParseStat
if (!Sym->isUndefined() || Sym->isVariable())
return Error(IDLoc, "invalid symbol redefinition");
- // End of Labels should be treated as end of line for lexing
- // purposes but that information is not available to the Lexer who
- // does not understand Labels. This may cause us to see a Hash
- // here instead of a preprocessor line comment.
- if (getTok().is(AsmToken::Hash)) {
- StringRef CommentStr = parseStringToEndOfStatement();
- Lexer.Lex();
- Lexer.UnLex(AsmToken(AsmToken::EndOfStatement, CommentStr));
- }
-
// Consume any end of statement token, if present, to avoid spurious
// AddBlankLine calls().
if (getTok().is(AsmToken::EndOfStatement)) {
Removed: llvm/trunk/test/MC/ARM/preserve-comments-arm.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/preserve-comments-arm.s?rev=277467&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/preserve-comments-arm.s (original)
+++ llvm/trunk/test/MC/ARM/preserve-comments-arm.s (removed)
@@ -1,10 +0,0 @@
- @RUN: llvm-mc -preserve-comments -n -triple arm-eabi < %s > %t
- @RUN: sed 's/#[C]omment/@Comment/g' %s > %t2
- @RUN: diff %t %t2
- .text
-
- mov r0, r0
-foo: #Comment here
- mov r0, r0 @ EOL comment
- .ident ""
-
More information about the llvm-commits
mailing list