Author: Paul Robinson Date: 2023-10-06T12:55:48-07:00 New Revision: 9500616a049995c0d23e070534a41b2ddbec1495
URL: https://github.com/llvm/llvm-project/commit/9500616a049995c0d23e070534a41b2ddbec1495 DIFF: https://github.com/llvm/llvm-project/commit/9500616a049995c0d23e070534a41b2ddbec1495.diff LOG: [NFC] Change a reference member to pointer This will allow the raw_ostream to be redirected in a subsequent commit. Added: Modified: clang/lib/Frontend/PrintPreprocessedOutput.cpp Removed: ################################################################################ diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp index 1b262d9e6f7cb3b..f86ba08d36223be 100644 --- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/clang/lib/Frontend/PrintPreprocessedOutput.cpp @@ -32,42 +32,42 @@ using namespace clang; /// PrintMacroDefinition - Print a macro definition in a form that will be /// properly accepted back as a definition. static void PrintMacroDefinition(const IdentifierInfo &II, const MacroInfo &MI, - Preprocessor &PP, raw_ostream &OS) { - OS << "#define " << II.getName(); + Preprocessor &PP, raw_ostream *OS) { + *OS << "#define " << II.getName(); if (MI.isFunctionLike()) { - OS << '('; + *OS << '('; if (!MI.param_empty()) { MacroInfo::param_iterator AI = MI.param_begin(), E = MI.param_end(); for (; AI+1 != E; ++AI) { - OS << (*AI)->getName(); - OS << ','; + *OS << (*AI)->getName(); + *OS << ','; } // Last argument. if ((*AI)->getName() == "__VA_ARGS__") - OS << "..."; + *OS << "..."; else - OS << (*AI)->getName(); + *OS << (*AI)->getName(); } if (MI.isGNUVarargs()) - OS << "..."; // #define foo(x...) + *OS << "..."; // #define foo(x...) - OS << ')'; + *OS << ')'; } // GCC always emits a space, even if the macro body is empty. However, do not // want to emit two spaces if the first token has a leading space. if (MI.tokens_empty() || !MI.tokens_begin()->hasLeadingSpace()) - OS << ' '; + *OS << ' '; SmallString<128> SpellingBuffer; for (const auto &T : MI.tokens()) { if (T.hasLeadingSpace()) - OS << ' '; + *OS << ' '; - OS << PP.getSpelling(T, SpellingBuffer); + *OS << PP.getSpelling(T, SpellingBuffer); } } @@ -81,7 +81,7 @@ class PrintPPOutputPPCallbacks : public PPCallbacks { SourceManager &SM; TokenConcatenation ConcatInfo; public: - raw_ostream &OS; + raw_ostream *OS; private: unsigned CurLine; @@ -102,7 +102,7 @@ class PrintPPOutputPPCallbacks : public PPCallbacks { Token PrevPrevTok; public: - PrintPPOutputPPCallbacks(Preprocessor &pp, raw_ostream &os, bool lineMarkers, + PrintPPOutputPPCallbacks(Preprocessor &pp, raw_ostream *os, bool lineMarkers, bool defines, bool DumpIncludeDirectives, bool UseLineDirectives, bool MinimizeWhitespace, bool DirectivesOnly) @@ -235,23 +235,23 @@ void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo, // Emit #line directives or GNU line markers depending on what mode we're in. if (UseLineDirectives) { - OS << "#line" << ' ' << LineNo << ' ' << '"'; - OS.write_escaped(CurFilename); - OS << '"'; + *OS << "#line" << ' ' << LineNo << ' ' << '"'; + OS->write_escaped(CurFilename); + *OS << '"'; } else { - OS << '#' << ' ' << LineNo << ' ' << '"'; - OS.write_escaped(CurFilename); - OS << '"'; + *OS << '#' << ' ' << LineNo << ' ' << '"'; + OS->write_escaped(CurFilename); + *OS << '"'; if (ExtraLen) - OS.write(Extra, ExtraLen); + OS->write(Extra, ExtraLen); if (FileType == SrcMgr::C_System) - OS.write(" 3", 2); + OS->write(" 3", 2); else if (FileType == SrcMgr::C_ExternCSystem) - OS.write(" 3 4", 4); + OS->write(" 3 4", 4); } - OS << '\n'; + *OS << '\n'; } /// MoveToLine - Move the output to the source line specified by the location @@ -266,7 +266,7 @@ bool PrintPPOutputPPCallbacks::MoveToLine(unsigned LineNo, bool StartedNewLine = false; if ((RequireStartOfLine && EmittedTokensOnThisLine) || EmittedDirectiveOnThisLine) { - OS << '\n'; + *OS << '\n'; StartedNewLine = true; CurLine += 1; EmittedTokensOnThisLine = false; @@ -283,12 +283,12 @@ bool PrintPPOutputPPCallbacks::MoveToLine(unsigned LineNo, // Printing a single line has priority over printing a #line directive, even // when minimizing whitespace which otherwise would print #line directives // for every single line. - OS << '\n'; + *OS << '\n'; StartedNewLine = true; } else if (!DisableLineMarkers) { if (LineNo - CurLine <= 8) { const char *NewLines = "\n\n\n\n\n\n\n\n"; - OS.write(NewLines, LineNo - CurLine); + OS->write(NewLines, LineNo - CurLine); } else { // Emit a #line or line marker. WriteLineInfo(LineNo, nullptr, 0); @@ -297,7 +297,7 @@ bool PrintPPOutputPPCallbacks::MoveToLine(unsigned LineNo, } else if (EmittedTokensOnThisLine) { // If we are not on the correct line and don't need to be line-correct, // at least ensure we start on a new line. - OS << '\n'; + *OS << '\n'; StartedNewLine = true; } @@ -312,7 +312,7 @@ bool PrintPPOutputPPCallbacks::MoveToLine(unsigned LineNo, void PrintPPOutputPPCallbacks::startNewLineIfNeeded() { if (EmittedTokensOnThisLine || EmittedDirectiveOnThisLine) { - OS << '\n'; + *OS << '\n'; EmittedTokensOnThisLine = false; EmittedDirectiveOnThisLine = false; } @@ -399,9 +399,9 @@ void PrintPPOutputPPCallbacks::InclusionDirective( MoveToLine(HashLoc, /*RequireStartOfLine=*/true); const std::string TokenText = PP.getSpelling(IncludeTok); assert(!TokenText.empty()); - OS << "#" << TokenText << " " - << (IsAngled ? '<' : '"') << FileName << (IsAngled ? '>' : '"') - << " /* clang -E -dI */"; + *OS << "#" << TokenText << " " + << (IsAngled ? '<' : '"') << FileName << (IsAngled ? '>' : '"') + << " /* clang -E -dI */"; setEmittedDirectiveOnThisLine(); } @@ -412,11 +412,11 @@ void PrintPPOutputPPCallbacks::InclusionDirective( case tok::pp_import: case tok::pp_include_next: MoveToLine(HashLoc, /*RequireStartOfLine=*/true); - OS << "#pragma clang module import " << Imported->getFullModuleName(true) - << " /* clang -E: implicit import for " - << "#" << PP.getSpelling(IncludeTok) << " " - << (IsAngled ? '<' : '"') << FileName << (IsAngled ? '>' : '"') - << " */"; + *OS << "#pragma clang module import " << Imported->getFullModuleName(true) + << " /* clang -E: implicit import for " + << "#" << PP.getSpelling(IncludeTok) << " " + << (IsAngled ? '<' : '"') << FileName << (IsAngled ? '>' : '"') + << " */"; setEmittedDirectiveOnThisLine(); break; @@ -438,14 +438,14 @@ void PrintPPOutputPPCallbacks::InclusionDirective( /// Handle entering the scope of a module during a module compilation. void PrintPPOutputPPCallbacks::BeginModule(const Module *M) { startNewLineIfNeeded(); - OS << "#pragma clang module begin " << M->getFullModuleName(true); + *OS << "#pragma clang module begin " << M->getFullModuleName(true); setEmittedDirectiveOnThisLine(); } /// Handle leaving the scope of a module during a module compilation. void PrintPPOutputPPCallbacks::EndModule(const Module *M) { startNewLineIfNeeded(); - OS << "#pragma clang module end /*" << M->getFullModuleName(true) << "*/"; + *OS << "#pragma clang module end /*" << M->getFullModuleName(true) << "*/"; setEmittedDirectiveOnThisLine(); } @@ -454,8 +454,8 @@ void PrintPPOutputPPCallbacks::EndModule(const Module *M) { void PrintPPOutputPPCallbacks::Ident(SourceLocation Loc, StringRef S) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS.write("#ident ", strlen("#ident ")); - OS.write(S.begin(), S.size()); + OS->write("#ident ", strlen("#ident ")); + OS->write(S.begin(), S.size()); setEmittedTokensOnThisLine(); } @@ -491,19 +491,19 @@ void PrintPPOutputPPCallbacks::MacroUndefined(const Token &MacroNameTok, return; MoveToLine(MacroNameTok.getLocation(), /*RequireStartOfLine=*/true); - OS << "#undef " << MacroNameTok.getIdentifierInfo()->getName(); + *OS << "#undef " << MacroNameTok.getIdentifierInfo()->getName(); setEmittedDirectiveOnThisLine(); } -static void outputPrintable(raw_ostream &OS, StringRef Str) { +static void outputPrintable(raw_ostream *OS, StringRef Str) { for (unsigned char Char : Str) { if (isPrintable(Char) && Char != '\\' && Char != '"') - OS << (char)Char; + *OS << (char)Char; else // Output anything hard as an octal escape. - OS << '\\' - << (char)('0' + ((Char >> 6) & 7)) - << (char)('0' + ((Char >> 3) & 7)) - << (char)('0' + ((Char >> 0) & 7)); + *OS << '\\' + << (char)('0' + ((Char >> 6) & 7)) + << (char)('0' + ((Char >> 3) & 7)) + << (char)('0' + ((Char >> 0) & 7)); } } @@ -512,25 +512,25 @@ void PrintPPOutputPPCallbacks::PragmaMessage(SourceLocation Loc, PragmaMessageKind Kind, StringRef Str) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma "; + *OS << "#pragma "; if (!Namespace.empty()) - OS << Namespace << ' '; + *OS << Namespace << ' '; switch (Kind) { case PMK_Message: - OS << "message(\""; + *OS << "message(\""; break; case PMK_Warning: - OS << "warning \""; + *OS << "warning \""; break; case PMK_Error: - OS << "error \""; + *OS << "error \""; break; } outputPrintable(OS, Str); - OS << '"'; + *OS << '"'; if (Kind == PMK_Message) - OS << ')'; + *OS << ')'; setEmittedDirectiveOnThisLine(); } @@ -538,8 +538,8 @@ void PrintPPOutputPPCallbacks::PragmaDebug(SourceLocation Loc, StringRef DebugType) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma clang __debug "; - OS << DebugType; + *OS << "#pragma clang __debug "; + *OS << DebugType; setEmittedDirectiveOnThisLine(); } @@ -547,14 +547,14 @@ void PrintPPOutputPPCallbacks::PragmaDebug(SourceLocation Loc, void PrintPPOutputPPCallbacks:: PragmaDiagnosticPush(SourceLocation Loc, StringRef Namespace) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma " << Namespace << " diagnostic push"; + *OS << "#pragma " << Namespace << " diagnostic push"; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks:: PragmaDiagnosticPop(SourceLocation Loc, StringRef Namespace) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma " << Namespace << " diagnostic pop"; + *OS << "#pragma " << Namespace << " diagnostic pop"; setEmittedDirectiveOnThisLine(); } @@ -563,25 +563,25 @@ void PrintPPOutputPPCallbacks::PragmaDiagnostic(SourceLocation Loc, diag::Severity Map, StringRef Str) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma " << Namespace << " diagnostic "; + *OS << "#pragma " << Namespace << " diagnostic "; switch (Map) { case diag::Severity::Remark: - OS << "remark"; + *OS << "remark"; break; case diag::Severity::Warning: - OS << "warning"; + *OS << "warning"; break; case diag::Severity::Error: - OS << "error"; + *OS << "error"; break; case diag::Severity::Ignored: - OS << "ignored"; + *OS << "ignored"; break; case diag::Severity::Fatal: - OS << "fatal"; + *OS << "fatal"; break; } - OS << " \"" << Str << '"'; + *OS << " \"" << Str << '"'; setEmittedDirectiveOnThisLine(); } @@ -590,69 +590,69 @@ void PrintPPOutputPPCallbacks::PragmaWarning(SourceLocation Loc, ArrayRef<int> Ids) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma warning("; + *OS << "#pragma warning("; switch(WarningSpec) { - case PWS_Default: OS << "default"; break; - case PWS_Disable: OS << "disable"; break; - case PWS_Error: OS << "error"; break; - case PWS_Once: OS << "once"; break; - case PWS_Suppress: OS << "suppress"; break; - case PWS_Level1: OS << '1'; break; - case PWS_Level2: OS << '2'; break; - case PWS_Level3: OS << '3'; break; - case PWS_Level4: OS << '4'; break; + case PWS_Default: *OS << "default"; break; + case PWS_Disable: *OS << "disable"; break; + case PWS_Error: *OS << "error"; break; + case PWS_Once: *OS << "once"; break; + case PWS_Suppress: *OS << "suppress"; break; + case PWS_Level1: *OS << '1'; break; + case PWS_Level2: *OS << '2'; break; + case PWS_Level3: *OS << '3'; break; + case PWS_Level4: *OS << '4'; break; } - OS << ':'; + *OS << ':'; for (ArrayRef<int>::iterator I = Ids.begin(), E = Ids.end(); I != E; ++I) - OS << ' ' << *I; - OS << ')'; + *OS << ' ' << *I; + *OS << ')'; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks::PragmaWarningPush(SourceLocation Loc, int Level) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma warning(push"; + *OS << "#pragma warning(push"; if (Level >= 0) - OS << ", " << Level; - OS << ')'; + *OS << ", " << Level; + *OS << ')'; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks::PragmaWarningPop(SourceLocation Loc) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma warning(pop)"; + *OS << "#pragma warning(pop)"; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks::PragmaExecCharsetPush(SourceLocation Loc, StringRef Str) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma character_execution_set(push"; + *OS << "#pragma character_execution_set(push"; if (!Str.empty()) - OS << ", " << Str; - OS << ')'; + *OS << ", " << Str; + *OS << ')'; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks::PragmaExecCharsetPop(SourceLocation Loc) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma character_execution_set(pop)"; + *OS << "#pragma character_execution_set(pop)"; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks:: PragmaAssumeNonNullBegin(SourceLocation Loc) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma clang assume_nonnull begin"; + *OS << "#pragma clang assume_nonnull begin"; setEmittedDirectiveOnThisLine(); } void PrintPPOutputPPCallbacks:: PragmaAssumeNonNullEnd(SourceLocation Loc) { MoveToLine(Loc, /*RequireStartOfLine=*/true); - OS << "#pragma clang assume_nonnull end"; + *OS << "#pragma clang assume_nonnull end"; setEmittedDirectiveOnThisLine(); } @@ -673,7 +673,7 @@ void PrintPPOutputPPCallbacks::HandleWhitespaceBeforeTok(const Token &Tok, if (MinimizeWhitespace) { // Avoid interpreting hash as a directive under -fpreprocessed. if (Tok.is(tok::hash)) - OS << ' '; + *OS << ' '; } else { // Print out space characters so that the first token on a line is // indented for easy reading. @@ -693,11 +693,11 @@ void PrintPPOutputPPCallbacks::HandleWhitespaceBeforeTok(const Token &Tok, // is not handled as a #define next time through the preprocessor if in // -fpreprocessed mode. if (ColNo <= 1 && Tok.is(tok::hash)) - OS << ' '; + *OS << ' '; // Otherwise, indent the appropriate number of spaces. for (; ColNo > 1; --ColNo) - OS << ' '; + *OS << ' '; } } else { // Insert whitespace between the previous and next token if either @@ -709,7 +709,7 @@ void PrintPPOutputPPCallbacks::HandleWhitespaceBeforeTok(const Token &Tok, if (RequireSpace || (!MinimizeWhitespace && Tok.hasLeadingSpace()) || ((EmittedTokensOnThisLine || EmittedDirectiveOnThisLine) && AvoidConcat(PrevPrevTok, PrevTok, Tok))) - OS << ' '; + *OS << ' '; } PrevPrevTok = PrevTok; @@ -758,7 +758,7 @@ struct UnknownPragmaHandler : public PragmaHandler { // Figure out what line we went to and insert the appropriate number of // newline characters. Callbacks->MoveToLine(PragmaTok.getLocation(), /*RequireStartOfLine=*/true); - Callbacks->OS.write(Prefix, strlen(Prefix)); + Callbacks->OS->write(Prefix, strlen(Prefix)); Callbacks->setEmittedTokensOnThisLine(); if (ShouldExpandTokens) { @@ -779,7 +779,7 @@ struct UnknownPragmaHandler : public PragmaHandler { /*RequireSameLine=*/true); IsFirst = false; std::string TokSpell = PP.getSpelling(PragmaTok); - Callbacks->OS.write(&TokSpell[0], TokSpell.size()); + Callbacks->OS->write(&TokSpell[0], TokSpell.size()); Callbacks->setEmittedTokensOnThisLine(); if (ShouldExpandTokens) @@ -795,7 +795,7 @@ struct UnknownPragmaHandler : public PragmaHandler { static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, PrintPPOutputPPCallbacks *Callbacks, - raw_ostream &OS) { + raw_ostream *OS) { bool DropComments = PP.getLangOpts().TraditionalCPP && !PP.getCommentRetentionState(); @@ -863,7 +863,7 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, // components. We don't have a good way to round-trip those. Module *M = reinterpret_cast<Module *>(Tok.getAnnotationValue()); std::string Name = M->getFullModuleName(); - OS.write(Name.data(), Name.size()); + OS->write(Name.data(), Name.size()); Callbacks->HandleNewlinesInToken(Name.data(), Name.size()); } else if (Tok.isAnnotation()) { // Ignore annotation tokens created by pragmas - the pragmas themselves @@ -871,14 +871,14 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, PP.Lex(Tok); continue; } else if (IdentifierInfo *II = Tok.getIdentifierInfo()) { - OS << II->getName(); + *OS << II->getName(); } else if (Tok.isLiteral() && !Tok.needsCleaning() && Tok.getLiteralData()) { - OS.write(Tok.getLiteralData(), Tok.getLength()); + OS->write(Tok.getLiteralData(), Tok.getLength()); } else if (Tok.getLength() < std::size(Buffer)) { const char *TokPtr = Buffer; unsigned Len = PP.getSpelling(Tok, TokPtr); - OS.write(TokPtr, Len); + OS->write(TokPtr, Len); // Tokens that can contain embedded newlines need to adjust our current // line number. @@ -895,7 +895,7 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok, } } else { std::string S = PP.getSpelling(Tok); - OS.write(S.data(), S.size()); + OS->write(S.data(), S.size()); // Tokens that can contain embedded newlines need to adjust our current // line number. @@ -947,7 +947,7 @@ static void DoPrintMacros(Preprocessor &PP, raw_ostream *OS) { // Ignore computed macros like __LINE__ and friends. if (MI.isBuiltinMacro()) continue; - PrintMacroDefinition(*MacrosByID[i].first, MI, PP, *OS); + PrintMacroDefinition(*MacrosByID[i].first, MI, PP, OS); *OS << '\n'; } } @@ -968,7 +968,7 @@ void clang::DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream *OS, PP.SetCommentRetentionState(Opts.ShowComments, Opts.ShowMacroComments); PrintPPOutputPPCallbacks *Callbacks = new PrintPPOutputPPCallbacks( - PP, *OS, !Opts.ShowLineMarkers, Opts.ShowMacros, + PP, OS, !Opts.ShowLineMarkers, Opts.ShowMacros, Opts.ShowIncludeDirectives, Opts.UseLineDirectives, Opts.MinimizeWhitespace, Opts.DirectivesOnly); @@ -1028,7 +1028,7 @@ void clang::DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream *OS, } while (true); // Read all the preprocessed tokens, printing them out to the stream. - PrintPreprocessedTokens(PP, Tok, Callbacks, *OS); + PrintPreprocessedTokens(PP, Tok, Callbacks, OS); *OS << '\n'; // Remove the handlers we just added to leave the preprocessor in a sane state _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
