Author: Benjamin Kramer Date: 2020-04-11T17:20:11+02:00 New Revision: 52dcbcbfe07acfe79ac16b343684f8786f1fd0d7
URL: https://github.com/llvm/llvm-project/commit/52dcbcbfe07acfe79ac16b343684f8786f1fd0d7 DIFF: https://github.com/llvm/llvm-project/commit/52dcbcbfe07acfe79ac16b343684f8786f1fd0d7.diff LOG: Simplify string joins. NFCI. Added: Modified: clang/lib/Format/BreakableToken.cpp clang/lib/Sema/Sema.cpp clang/tools/driver/cc1as_main.cpp llvm/lib/Support/Triple.cpp llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/BreakableToken.cpp b/clang/lib/Format/BreakableToken.cpp index 1d2fefeef26e..4294c2a653fa 100644 --- a/clang/lib/Format/BreakableToken.cpp +++ b/clang/lib/Format/BreakableToken.cpp @@ -588,8 +588,7 @@ void BreakableBlockComment::insertBreak(unsigned LineIndex, unsigned TailOffset, unsigned CharsToRemove = Split.second; assert(LocalIndentAtLineBreak >= Prefix.size()); std::string PrefixWithTrailingIndent = std::string(Prefix); - for (unsigned I = 0; I < ContentIndent; ++I) - PrefixWithTrailingIndent += " "; + PrefixWithTrailingIndent.append(ContentIndent, ' '); Whitespaces.replaceWhitespaceInToken( tokenAt(LineIndex), BreakOffsetInToken, CharsToRemove, "", PrefixWithTrailingIndent, InPPDirective, /*Newlines=*/1, diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp index 6c1666162c81..5e5a90ad0143 100644 --- a/clang/lib/Sema/Sema.cpp +++ b/clang/lib/Sema/Sema.cpp @@ -2354,16 +2354,8 @@ std::string Sema::getOpenCLExtensionsFromTypeExtMap(FunctionType *FT) { template <typename T, typename MapT> std::string Sema::getOpenCLExtensionsFromExtMap(T *FDT, MapT &Map) { - std::string ExtensionNames = ""; auto Loc = Map.find(FDT); - - for (auto const& I : Loc->second) { - ExtensionNames += I; - ExtensionNames += " "; - } - ExtensionNames.pop_back(); - - return ExtensionNames; + return llvm::join(Loc->second, " "); } bool Sema::isOpenCLDisabledDecl(Decl *FD) { diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index 016df0be1e15..77b99b201364 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -429,12 +429,7 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, SrcMgr.getMemoryBuffer(BufferIndex)->getBuffer()); // Build up the feature string from the target feature list. - std::string FS; - if (!Opts.Features.empty()) { - FS = Opts.Features[0]; - for (unsigned i = 1, e = Opts.Features.size(); i != e; ++i) - FS += "," + Opts.Features[i]; - } + std::string FS = llvm::join(Opts.Features, ","); std::unique_ptr<MCStreamer> Str; diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 1a210d29e1bf..da6b877a8504 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -9,6 +9,7 @@ #include "llvm/ADT/Triple.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Host.h" @@ -985,12 +986,7 @@ std::string Triple::normalize(StringRef Str) { } // Stick the corrected components back together to form the normalized string. - std::string Normalized; - for (unsigned i = 0, e = Components.size(); i != e; ++i) { - if (i) Normalized += '-'; - Normalized += Components[i]; - } - return Normalized; + return join(Components, "-"); } StringRef Triple::getArchName() const { diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index 1363e0a52c11..9d10def0a211 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -30,8 +30,7 @@ std::string escape(StringRef Str, const CoverageViewOptions &Opts) { if (C == '\t') { // Replace '\t' with up to TabSize spaces. unsigned NumSpaces = Opts.TabSize - (ColNum % Opts.TabSize); - for (unsigned I = 0; I < NumSpaces; ++I) - TabExpandedResult += ' '; + TabExpandedResult.append(NumSpaces, ' '); ColNum += NumSpaces; } else { TabExpandedResult += C; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits