From 2d17ab783b24df7e53bf3d02fe0deb70f63c14ab Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 18 Mar 2009 21:00:25 +0000 Subject: when preprocessing a .S file, unknown directives should just be passed through, and the token after the # should be expanded if it is not a valid directive. This allows us to transform things like: #define FOO BAR # FOO into # BAR, even though FOO is not normally expanded for directives. This should fix PR3833 llvm-svn: 67236 --- clang/lib/Lex/PPDirectives.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'clang/lib/Lex/PPDirectives.cpp') diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 8e76b920aab..5797b12ebc8 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -476,6 +476,9 @@ void Preprocessor::HandleDirective(Token &Result) { // pp-directive. bool ReadAnyTokensBeforeDirective = CurPPLexer->MIOpt.getHasReadAnyTokensVal(); + // Save the '#' token in case we need to return it later. + Token SavedHash = Result; + // Read the next token, the directive flavor. This isn't expanded due to // C99 6.10.3p8. LexUnexpandedToken(Result); @@ -568,6 +571,22 @@ TryAgain: break; } + // If this is a .S file, treat unknown # directives as non-preprocessor + // directives. This is important because # may be a comment or introduce + // various pseudo-ops. Just return the # token and push back the following + // token to be lexed next time. + if (getLangOptions().AsmPreprocessor) { + Token *Toks = new Token[2](); + // Return the # and the token after it. + Toks[0] = SavedHash; + Toks[1] = Result; + // Enter this token stream so that we re-lex the tokens. Make sure to + // enable macro expansion, in case the token after the # is an identifier + // that is expanded. + EnterTokenStream(Toks, 2, false, true); + return; + } + // If we reached here, the preprocessing token is not valid! Diag(Result, diag::err_pp_invalid_directive); -- cgit v1.2.3