https://github.com/Rinn updated https://github.com/llvm/llvm-project/pull/205084
>From 25db0f0051754ebc88a1b42438d4d593b486f934 Mon Sep 17 00:00:00 2001 From: Joe Kirchoff <[email protected]> Date: Mon, 22 Jun 2026 12:29:50 +0100 Subject: [PATCH 1/4] Fix preprocessed block comment newline on windows When preprocessing a source file on windows with \r\n newlines while preserving comments, any newlines in a block comment are written directly which is then later normalized to \r\r\n. Fix this by only writing out \n in PrintPreprocessedTokens for those comments by copying the logic from PrintPPOutputPPCallbacks::HandleNewlinesInToken --- .../lib/Frontend/PrintPreprocessedOutput.cpp | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 02266882c4c4a..16c09d1263e30 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -889,6 +889,26 @@ struct UnknownPragmaHandler : public PragmaHandler { }; } // end anonymous namespace +static void PrintPreprocessedComment(raw_ostream *OS, const char *TokStr, + unsigned Len) { + for (; Len; --Len, ++TokStr) { + if (*TokStr != '\n' && + *TokStr != '\r') { + *OS << *TokStr; + continue; + } + + *OS << '\n'; + + // If we have \n\r or \r\n, skip both and emit one newline. + if (Len != 1 && + (TokStr[1] == '\n' || TokStr[1] == '\r') && + TokStr[0] != TokStr[1]) { + ++TokStr; + --Len; + } + } +} static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, PrintPPOutputPPCallbacks *Callbacks) { @@ -1022,7 +1042,10 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } else if (Tok.getLength() < std::size(Buffer)) { const char *TokPtr = Buffer; unsigned Len = PP.getSpelling(Tok, TokPtr); - Callbacks->OS->write(TokPtr, Len); + if (Tok.is(tok::comment)) + PrintPreprocessedComment(Callbacks->OS, TokPtr, Len); + else + Callbacks->OS->write(TokPtr, Len); // Tokens that can contain embedded newlines need to adjust our current // line number. @@ -1039,7 +1062,10 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } } else { std::string S = PP.getSpelling(Tok); - Callbacks->OS->write(S.data(), S.size()); + if (Tok.is(tok::comment)) + PrintPreprocessedComment(Callbacks->OS, S.data(), S.size()); + else + Callbacks->OS->write(S.data(), S.size()); // Tokens that can contain embedded newlines need to adjust our current // line number. >From 515cd83647efe645fe4ece3c3e2e306cd57c09ec Mon Sep 17 00:00:00 2001 From: Joe Kirchoff <[email protected]> Date: Mon, 22 Jun 2026 12:48:29 +0100 Subject: [PATCH 2/4] clang-format --- clang/lib/Frontend/PrintPreprocessedOutput.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 16c09d1263e30..40c1b89366a7c 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -892,8 +892,7 @@ struct UnknownPragmaHandler : public PragmaHandler { static void PrintPreprocessedComment(raw_ostream *OS, const char *TokStr, unsigned Len) { for (; Len; --Len, ++TokStr) { - if (*TokStr != '\n' && - *TokStr != '\r') { + if (*TokStr != '\n' && *TokStr != '\r') { *OS << *TokStr; continue; } @@ -901,8 +900,7 @@ static void PrintPreprocessedComment(raw_ostream *OS, const char *TokStr, *OS << '\n'; // If we have \n\r or \r\n, skip both and emit one newline. - if (Len != 1 && - (TokStr[1] == '\n' || TokStr[1] == '\r') && + if (Len != 1 && (TokStr[1] == '\n' || TokStr[1] == '\r') && TokStr[0] != TokStr[1]) { ++TokStr; --Len; >From dec4c02c62716739b9969321f191970f02a6e046 Mon Sep 17 00:00:00 2001 From: Joe Kirchoff <[email protected]> Date: Fri, 26 Jun 2026 09:13:35 +0100 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Aaron Ballman <[email protected]> --- clang/lib/Frontend/PrintPreprocessedOutput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 40c1b89366a7c..38a802dd7614b 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -1040,7 +1040,7 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } else if (Tok.getLength() < std::size(Buffer)) { const char *TokPtr = Buffer; unsigned Len = PP.getSpelling(Tok, TokPtr); - if (Tok.is(tok::comment)) + if (Tok.is(tok::comment, tok::unknown)) PrintPreprocessedComment(Callbacks->OS, TokPtr, Len); else Callbacks->OS->write(TokPtr, Len); @@ -1060,7 +1060,7 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } } else { std::string S = PP.getSpelling(Tok); - if (Tok.is(tok::comment)) + if (Tok.is(tok::comment, tok::unknown)) PrintPreprocessedComment(Callbacks->OS, S.data(), S.size()); else Callbacks->OS->write(S.data(), S.size()); >From b9afb477f1e82741f15275046d45176428cffb1e Mon Sep 17 00:00:00 2001 From: Joe Kirchoff <[email protected]> Date: Fri, 26 Jun 2026 10:12:25 +0100 Subject: [PATCH 4/4] Fix Token.is only accepting one paramter, rename PrintPreprocessedComment --- clang/lib/Frontend/PrintPreprocessedOutput.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 38a802dd7614b..57de5126bcd71 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -889,8 +889,8 @@ struct UnknownPragmaHandler : public PragmaHandler { }; } // end anonymous namespace -static void PrintPreprocessedComment(raw_ostream *OS, const char *TokStr, - unsigned Len) { +static void WriteMultilineToken(raw_ostream *OS, const char *TokStr, + unsigned Len) { for (; Len; --Len, ++TokStr) { if (*TokStr != '\n' && *TokStr != '\r') { *OS << *TokStr; @@ -1040,8 +1040,8 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } else if (Tok.getLength() < std::size(Buffer)) { const char *TokPtr = Buffer; unsigned Len = PP.getSpelling(Tok, TokPtr); - if (Tok.is(tok::comment, tok::unknown)) - PrintPreprocessedComment(Callbacks->OS, TokPtr, Len); + if (Tok.is(tok::comment) || Tok.is(tok::unknown)) + WriteMultilineToken(Callbacks->OS, TokPtr, Len); else Callbacks->OS->write(TokPtr, Len); @@ -1060,8 +1060,8 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } } else { std::string S = PP.getSpelling(Tok); - if (Tok.is(tok::comment, tok::unknown)) - PrintPreprocessedComment(Callbacks->OS, S.data(), S.size()); + if (Tok.is(tok::comment) || Tok.is(tok::unknown)) + WriteMultilineToken(Callbacks->OS, S.data(), S.size()); else Callbacks->OS->write(S.data(), S.size()); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
