Index: llvm/include/llvm/Analysis/CGSCCPassManager.h =================================================================== --- llvm/include/llvm/Analysis/CGSCCPassManager.h +++ llvm/include/llvm/Analysis/CGSCCPassManager.h @@ -159,7 +159,7 @@ function_ref MapClassName2PassName) { auto ClassName = AnalysisT::name(); auto PassName = MapClassName2PassName(ClassName); - OS << "require<" << PassName << ">"; + OS << "require<" << PassName << '>'; } }; @@ -357,7 +357,7 @@ function_ref MapClassName2PassName) { OS << "cgscc("; Pass->printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } static bool isRequired() { return true; } @@ -489,9 +489,9 @@ OS << "function"; if (EagerlyInvalidate) OS << ""; - OS << "("; + OS << '('; Pass->printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } static bool isRequired() { return true; } @@ -567,7 +567,7 @@ function_ref MapClassName2PassName) { OS << "devirt<" << MaxIterations << ">("; Pass->printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } private: Index: llvm/include/llvm/IR/PassManager.h =================================================================== --- llvm/include/llvm/IR/PassManager.h +++ llvm/include/llvm/IR/PassManager.h @@ -489,7 +489,7 @@ auto *P = Passes[Idx].get(); P->printPipeline(OS, MapClassName2PassName); if (Idx + 1 < Size) - OS << ","; + OS << ','; } } @@ -1260,7 +1260,7 @@ function_ref MapClassName2PassName) { auto ClassName = AnalysisT::name(); auto PassName = MapClassName2PassName(ClassName); - OS << "require<" << PassName << ">"; + OS << "require<" << PassName << '>'; } static bool isRequired() { return true; } }; @@ -1286,7 +1286,7 @@ function_ref MapClassName2PassName) { auto ClassName = AnalysisT::name(); auto PassName = MapClassName2PassName(ClassName); - OS << "invalidate<" << PassName << ">"; + OS << "invalidate<" << PassName << '>'; } }; @@ -1341,7 +1341,7 @@ function_ref MapClassName2PassName) { OS << "repeat<" << Count << ">("; P.printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } private: Index: llvm/include/llvm/Transforms/Scalar/LoopPassManager.h =================================================================== --- llvm/include/llvm/Transforms/Scalar/LoopPassManager.h +++ llvm/include/llvm/Transforms/Scalar/LoopPassManager.h @@ -234,7 +234,7 @@ function_ref MapClassName2PassName) { auto ClassName = AnalysisT::name(); auto PassName = MapClassName2PassName(ClassName); - OS << "require<" << PassName << ">"; + OS << "require<" << PassName << '>'; } }; Index: llvm/lib/Analysis/StackLifetime.cpp =================================================================== --- llvm/lib/Analysis/StackLifetime.cpp +++ llvm/lib/Analysis/StackLifetime.cpp @@ -414,7 +414,7 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; switch (Type) { case StackLifetime::LivenessType::May: OS << "may"; @@ -423,5 +423,5 @@ OS << "must"; break; } - OS << ">"; + OS << '>'; } Index: llvm/lib/IR/PassManager.cpp =================================================================== --- llvm/lib/IR/PassManager.cpp +++ llvm/lib/IR/PassManager.cpp @@ -96,9 +96,9 @@ OS << "function"; if (EagerlyInvalidate) OS << ""; - OS << "("; + OS << '('; Pass->printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } PreservedAnalyses ModuleToFunctionPassAdaptor::run(Module &M, Index: llvm/lib/Transforms/Coroutines/CoroConditionalWrapper.cpp =================================================================== --- llvm/lib/Transforms/Coroutines/CoroConditionalWrapper.cpp +++ llvm/lib/Transforms/Coroutines/CoroConditionalWrapper.cpp @@ -26,7 +26,7 @@ void CoroConditionalWrapper::printPipeline( raw_ostream &OS, function_ref MapClassName2PassName) { OS << "coro-cond"; - OS << "("; + OS << '('; PM.printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } Index: llvm/lib/Transforms/IPO/Inliner.cpp =================================================================== --- llvm/lib/Transforms/IPO/Inliner.cpp +++ llvm/lib/Transforms/IPO/Inliner.cpp @@ -1193,13 +1193,13 @@ // on Params and Mode). if (!MPM.isEmpty()) { MPM.printPipeline(OS, MapClassName2PassName); - OS << ","; + OS << ','; } OS << "cgscc("; if (MaxDevirtIterations != 0) OS << "devirt<" << MaxDevirtIterations << ">("; PM.printPipeline(OS, MapClassName2PassName); if (MaxDevirtIterations != 0) - OS << ")"; - OS << ")"; + OS << ')'; + OS << ')'; } Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp =================================================================== --- llvm/lib/Transforms/IPO/LoopExtractor.cpp +++ llvm/lib/Transforms/IPO/LoopExtractor.cpp @@ -283,8 +283,8 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (NumLoops == 1) OS << "single"; - OS << ">"; + OS << '>'; } Index: llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp =================================================================== --- llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -1133,10 +1133,10 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (Options.CompileKernel) OS << "kernel"; - OS << ">"; + OS << '>'; } AddressSanitizerPass::AddressSanitizerPass( Index: llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp =================================================================== --- llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp +++ llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp @@ -438,12 +438,12 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (Options.CompileKernel) OS << "kernel;"; if (Options.Recover) OS << "recover"; - OS << ">"; + OS << '>'; } void HWAddressSanitizer::createHwasanCtorComdat() { Index: llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp =================================================================== --- llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -706,7 +706,7 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (Options.Recover) OS << "recover;"; if (Options.Kernel) @@ -714,7 +714,7 @@ if (Options.EagerChecks) OS << "eager-checks;"; OS << "track-origins=" << Options.TrackOrigins; - OS << ">"; + OS << '>'; } /// Create a non-const global initialized with the given string. Index: llvm/lib/Transforms/Scalar/EarlyCSE.cpp =================================================================== --- llvm/lib/Transforms/Scalar/EarlyCSE.cpp +++ llvm/lib/Transforms/Scalar/EarlyCSE.cpp @@ -1710,10 +1710,10 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (UseMemorySSA) OS << "memssa"; - OS << ">"; + OS << '>'; } namespace { Index: llvm/lib/Transforms/Scalar/GVN.cpp =================================================================== --- llvm/lib/Transforms/Scalar/GVN.cpp +++ llvm/lib/Transforms/Scalar/GVN.cpp @@ -772,7 +772,7 @@ static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (Options.AllowPRE != std::nullopt) OS << (*Options.AllowPRE ? "" : "no-") << "pre;"; if (Options.AllowLoadPRE != std::nullopt) @@ -782,7 +782,7 @@ << "split-backedge-load-pre;"; if (Options.AllowMemDep != std::nullopt) OS << (*Options.AllowMemDep ? "" : "no-") << "memdep"; - OS << ">"; + OS << '>'; } #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) Index: llvm/lib/Transforms/Scalar/LICM.cpp =================================================================== --- llvm/lib/Transforms/Scalar/LICM.cpp +++ llvm/lib/Transforms/Scalar/LICM.cpp @@ -293,9 +293,9 @@ static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; OS << (Opts.AllowSpeculation ? "" : "no-") << "allowspeculation"; - OS << ">"; + OS << '>'; } PreservedAnalyses LNICMPass::run(LoopNest &LN, LoopAnalysisManager &AM, @@ -334,9 +334,9 @@ static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; OS << (Opts.AllowSpeculation ? "" : "no-") << "allowspeculation"; - OS << ">"; + OS << '>'; } char LegacyLICMPass::ID = 0; Index: llvm/lib/Transforms/Scalar/LoopPassManager.cpp =================================================================== --- llvm/lib/Transforms/Scalar/LoopPassManager.cpp +++ llvm/lib/Transforms/Scalar/LoopPassManager.cpp @@ -59,7 +59,7 @@ P->printPipeline(OS, MapClassName2PassName); } if (Idx + 1 < Size) - OS << ","; + OS << ','; } } @@ -193,7 +193,7 @@ raw_ostream &OS, function_ref MapClassName2PassName) { OS << (UseMemorySSA ? "loop-mssa(" : "loop("); Pass->printPipeline(OS, MapClassName2PassName); - OS << ")"; + OS << ')'; } PreservedAnalyses FunctionToLoopPassAdaptor::run(Function &F, FunctionAnalysisManager &AM) { Index: llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp =================================================================== --- llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp +++ llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp @@ -1651,7 +1651,7 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (UnrollOpts.AllowPartial != std::nullopt) OS << (*UnrollOpts.AllowPartial ? "" : "no-") << "partial;"; if (UnrollOpts.AllowPeeling != std::nullopt) @@ -1664,7 +1664,7 @@ OS << (*UnrollOpts.AllowProfileBasedPeeling ? "" : "no-") << "profile-peeling;"; if (UnrollOpts.FullUnrollMaxCount != std::nullopt) - OS << "full-unroll-max=" << UnrollOpts.FullUnrollMaxCount << ";"; - OS << "O" << UnrollOpts.OptLevel; - OS << ">"; + OS << "full-unroll-max=" << UnrollOpts.FullUnrollMaxCount << ';'; + OS << 'O' << UnrollOpts.OptLevel; + OS << '>'; } Index: llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp =================================================================== --- llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp +++ llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp @@ -2397,10 +2397,10 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (Minimal) OS << "minimal"; - OS << ">"; + OS << '>'; } namespace { Index: llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp =================================================================== --- llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp +++ llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp @@ -428,7 +428,7 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; OS << (Options.SplitFooterBB ? "" : "no-") << "split-footer-bb"; - OS << ">"; + OS << '>'; } Index: llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp =================================================================== --- llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp +++ llvm/lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp @@ -1380,10 +1380,10 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this) ->printPipeline(OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (LowerGEP) OS << "lower-gep"; - OS << ">"; + OS << '>'; } PreservedAnalyses Index: llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp =================================================================== --- llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +++ llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp @@ -3583,10 +3583,10 @@ static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; OS << (NonTrivial ? "" : "no-") << "nontrivial;"; OS << (Trivial ? "" : "no-") << "trivial"; - OS << ">"; + OS << '>'; } namespace { Index: llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp =================================================================== --- llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -338,8 +338,8 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; - OS << "bonus-inst-threshold=" << Options.BonusInstThreshold << ";"; + OS << '<'; + OS << "bonus-inst-threshold=" << Options.BonusInstThreshold << ';'; OS << (Options.ForwardSwitchCondToPhi ? "" : "no-") << "forward-switch-cond;"; OS << (Options.ConvertSwitchRangeToICmp ? "" : "no-") << "switch-range-to-icmp;"; @@ -348,7 +348,7 @@ OS << (Options.NeedCanonicalLoop ? "" : "no-") << "keep-loops;"; OS << (Options.HoistCommonInsts ? "" : "no-") << "hoist-common-insts;"; OS << (Options.SinkCommonInsts ? "" : "no-") << "sink-common-insts"; - OS << ">"; + OS << '>'; } PreservedAnalyses SimplifyCFGPass::run(Function &F, Index: llvm/lib/Transforms/Utils/EntryExitInstrumenter.cpp =================================================================== --- llvm/lib/Transforms/Utils/EntryExitInstrumenter.cpp +++ llvm/lib/Transforms/Utils/EntryExitInstrumenter.cpp @@ -145,8 +145,8 @@ raw_ostream &OS, function_ref MapClassName2PassName) { static_cast *>(this) ->printPipeline(OS, MapClassName2PassName); - OS << "<"; + OS << '<'; if (PostInlining) OS << "post-inline"; - OS << ">"; + OS << '>'; } Index: llvm/lib/Transforms/Vectorize/LoopVectorize.cpp =================================================================== --- llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -10649,8 +10649,8 @@ static_cast *>(this)->printPipeline( OS, MapClassName2PassName); - OS << "<"; + OS << '<'; OS << (InterleaveOnlyWhenForced ? "" : "no-") << "interleave-forced-only;"; OS << (VectorizeOnlyWhenForced ? "" : "no-") << "vectorize-forced-only;"; - OS << ">"; + OS << '>'; }