Skip to content

[llvm] Use llvm::interleaved (NFC) #137531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions llvm/include/llvm/IR/ModuleSummaryIndex.h
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,7 @@ struct MIBInfo {

inline raw_ostream &operator<<(raw_ostream &OS, const MIBInfo &MIB) {
OS << "AllocType " << (unsigned)MIB.AllocType;
bool First = true;
OS << " StackIds: ";
for (auto Id : MIB.StackIdIndices) {
if (!First)
OS << ", ";
First = false;
OS << Id;
}
OS << " StackIds: " << llvm::interleaved(MIB.StackIdIndices);
return OS;
}

Expand Down
14 changes: 3 additions & 11 deletions llvm/utils/TableGen/OptionParserEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/Twine.h"
#include "llvm/Support/InterleavedRange.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TableGen/Record.h"
#include "llvm/TableGen/StringToOffsetTable.h"
Expand Down Expand Up @@ -232,17 +233,8 @@ static void emitHelpTextsForVariants(
assert(Visibilities.size() <= MaxVisibilityPerHelp &&
"Too many visibilities to store in an "
"OptTable::HelpTextsForVariants entry");
OS << "{std::array<unsigned, " << MaxVisibilityPerHelp << ">{{";

auto VisibilityEnd = Visibilities.cend();
for (auto Visibility = Visibilities.cbegin(); Visibility != VisibilityEnd;
++Visibility) {
OS << *Visibility;
if (std::next(Visibility) != VisibilityEnd)
OS << ", ";
}

OS << "}}, ";
OS << "{std::array<unsigned, " << MaxVisibilityPerHelp << ">{{"
<< llvm::interleaved(Visibilities) << "}}, ";

if (Help.size())
writeCstring(OS, Help);
Expand Down