[TableGen] Use std::pair instead of std::make_pair. NFC. #123174
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-llvm-selectiondag @llvm/pr-subscribers-backend-risc-v Author: Jay Foad (jayfoad) ChangesFull diff: https://github.com/llvm/llvm-project/pull/123174.diff 10 Files Affected:
diff --git a/llvm/include/llvm/TableGen/Record.h b/llvm/include/llvm/TableGen/Record.h
index b15e9fc7328da0..78e2bd0c1a11b3 100644
--- a/llvm/include/llvm/TableGen/Record.h
+++ b/llvm/include/llvm/TableGen/Record.h
@@ -1816,7 +1816,7 @@ class Record {
assert(!CorrespondingDefInit &&
"changing type of record after it has been referenced");
assert(!isSubClassOf(R) && "Already subclassing record!");
- SuperClasses.push_back(std::make_pair(R, Range));
+ SuperClasses.push_back(std::pair(R, Range));
}
/// If there are any field references that refer to fields that have been
@@ -1971,21 +1971,22 @@ class RecordKeeper {
}
void addClass(std::unique_ptr<Record> R) {
- bool Ins = Classes.insert(std::make_pair(std::string(R->getName()),
- std::move(R))).second;
+ bool Ins =
+ Classes.insert(std::pair(std::string(R->getName()), std::move(R)))
+ .second;
(void)Ins;
assert(Ins && "Class already exists");
}
void addDef(std::unique_ptr<Record> R) {
- bool Ins = Defs.insert(std::make_pair(std::string(R->getName()),
- std::move(R))).second;
+ bool Ins =
+ Defs.insert(std::pair(std::string(R->getName()), std::move(R))).second;
(void)Ins;
assert(Ins && "Record already exists");
}
void addExtraGlobal(StringRef Name, const Init *I) {
- bool Ins = ExtraGlobals.insert(std::make_pair(std::string(Name), I)).second;
+ bool Ins = ExtraGlobals.insert(std::pair(std::string(Name), I)).second;
(void)Ins;
assert(!getDef(Name));
assert(Ins && "Global already exists");
@@ -2071,14 +2072,14 @@ struct LessRecordRegister {
for (size_t I = 0, E = Rec.size(); I != E; ++I, ++Len) {
bool IsDigit = isDigit(Curr[I]);
if (IsDigit != IsDigitPart) {
- Parts.push_back(std::make_pair(IsDigitPart, StringRef(Start, Len)));
+ Parts.push_back(std::pair(IsDigitPart, StringRef(Start, Len)));
Len = 0;
Start = &Curr[I];
IsDigitPart = isDigit(Curr[I]);
}
}
// Push the last part.
- Parts.push_back(std::make_pair(IsDigitPart, StringRef(Start, Len)));
+ Parts.push_back(std::pair(IsDigitPart, StringRef(Start, Len)));
}
size_t size() { return Parts.size(); }
diff --git a/llvm/lib/TableGen/Record.cpp b/llvm/lib/TableGen/Record.cpp
index 597ccb7ca144bb..16014c01e4d73b 100644
--- a/llvm/lib/TableGen/Record.cpp
+++ b/llvm/lib/TableGen/Record.cpp
@@ -671,7 +671,7 @@ const StringInit *StringInit::get(RecordKeeper &RK, StringRef V,
detail::RecordKeeperImpl &RKImpl = RK.getImpl();
auto &InitMap = Fmt == SF_String ? RKImpl.StringInitStringPool
: RKImpl.StringInitCodePool;
- auto &Entry = *InitMap.insert(std::make_pair(V, nullptr)).first;
+ auto &Entry = *InitMap.insert(std::pair(V, nullptr)).first;
if (!Entry.second)
Entry.second = new (RKImpl.Allocator) StringInit(RK, Entry.getKey(), Fmt);
return Entry.second;
@@ -1674,7 +1674,7 @@ static const Init *ForeachDagApply(const Init *LHS, const DagInit *MHSd,
else
NewArg = ItemApply(LHS, Arg, RHS, CurRec);
- NewArgs.push_back(std::make_pair(NewArg, ArgName));
+ NewArgs.push_back(std::pair(NewArg, ArgName));
if (Arg != NewArg)
Change = true;
}
@@ -2260,7 +2260,7 @@ const VarInit *VarInit::get(StringRef VN, const RecTy *T) {
const VarInit *VarInit::get(const Init *VN, const RecTy *T) {
detail::RecordKeeperImpl &RK = T->getRecordKeeper().getImpl();
- VarInit *&I = RK.TheVarInitPool[std::make_pair(T, VN)];
+ VarInit *&I = RK.TheVarInitPool[std::pair(T, VN)];
if (!I)
I = new (RK.Allocator) VarInit(VN, T);
return I;
@@ -2285,7 +2285,7 @@ const Init *VarInit::resolveReferences(Resolver &R) const {
const VarBitInit *VarBitInit::get(const TypedInit *T, unsigned B) {
detail::RecordKeeperImpl &RK = T->getRecordKeeper().getImpl();
- VarBitInit *&I = RK.TheVarBitInitPool[std::make_pair(T, B)];
+ VarBitInit *&I = RK.TheVarBitInitPool[std::pair(T, B)];
if (!I)
I = new (RK.Allocator) VarBitInit(T, B);
return I;
@@ -2461,7 +2461,7 @@ std::string VarDefInit::getAsString() const {
const FieldInit *FieldInit::get(const Init *R, const StringInit *FN) {
detail::RecordKeeperImpl &RK = R->getRecordKeeper().getImpl();
- FieldInit *&I = RK.TheFieldInitPool[std::make_pair(R, FN)];
+ FieldInit *&I = RK.TheFieldInitPool[std::pair(R, FN)];
if (!I)
I = new (RK.Allocator) FieldInit(R, FN);
return I;
diff --git a/llvm/lib/TableGen/TGLexer.h b/llvm/lib/TableGen/TGLexer.h
index bac583c4e33a18..0be89b3ca6f75c 100644
--- a/llvm/lib/TableGen/TGLexer.h
+++ b/llvm/lib/TableGen/TGLexer.h
@@ -234,7 +234,7 @@ class TGLexer {
std::pair<int64_t, unsigned> getCurBinaryIntVal() const {
assert(CurCode == tgtok::BinaryIntVal &&
"This token isn't a binary integer");
- return std::make_pair(CurIntVal, (CurPtr - TokStart)-2);
+ return std::pair(CurIntVal, (CurPtr - TokStart) - 2);
}
SMLoc getLoc() const;
diff --git a/llvm/lib/TableGen/TGParser.cpp b/llvm/lib/TableGen/TGParser.cpp
index 60ae11b7f42612..8e15c991140bd4 100644
--- a/llvm/lib/TableGen/TGParser.cpp
+++ b/llvm/lib/TableGen/TGParser.cpp
@@ -3162,7 +3162,7 @@ void TGParser::ParseDagArgList(
Lex.Lex(); // eat the VarName.
}
- Result.push_back(std::make_pair(Val, VarName));
+ Result.push_back(std::pair(Val, VarName));
}
if (!consume(tgtok::comma))
break;
@@ -4152,9 +4152,8 @@ bool TGParser::ParseMultiClass() {
return TokError("expected identifier after multiclass for name");
std::string Name = Lex.getCurStrVal();
- auto Result =
- MultiClasses.insert(std::make_pair(Name,
- std::make_unique<MultiClass>(Name, Lex.getLoc(),Records)));
+ auto Result = MultiClasses.insert(std::pair(
+ Name, std::make_unique<MultiClass>(Name, Lex.getLoc(), Records)));
if (!Result.second)
return TokError("multiclass '" + Name + "' already defined");
diff --git a/llvm/lib/TableGen/TGParser.h b/llvm/lib/TableGen/TGParser.h
index 4509893eefc2c8..98e7fcff9b4670 100644
--- a/llvm/lib/TableGen/TGParser.h
+++ b/llvm/lib/TableGen/TGParser.h
@@ -131,7 +131,7 @@ class TGVarScope {
}
void addVar(StringRef Name, const Init *I) {
- bool Ins = Vars.insert(std::make_pair(std::string(Name), I)).second;
+ bool Ins = Vars.insert(std::pair(std::string(Name), I)).second;
(void)Ins;
assert(Ins && "Local variable already exists");
}
diff --git a/llvm/utils/TableGen/Basic/DirectiveEmitter.cpp b/llvm/utils/TableGen/Basic/DirectiveEmitter.cpp
index fd815f4a31dad8..72fce384337c64 100644
--- a/llvm/utils/TableGen/Basic/DirectiveEmitter.cpp
+++ b/llvm/utils/TableGen/Basic/DirectiveEmitter.cpp
@@ -495,7 +495,7 @@ static void emitLeafTable(const DirectiveLanguage &DirLang, raw_ostream &OS,
DenseMap<const Record *, int> DirId; // Record * -> llvm::omp::Directive
for (auto [Idx, Rec] : enumerate(Directives))
- DirId.insert(std::make_pair(Rec, Idx));
+ DirId.insert(std::pair(Rec, Idx));
using LeafList = std::vector<int>;
int MaxLeafCount = getMaxLeafCount(DirLang);
@@ -675,7 +675,7 @@ static void generateGetDirectiveAssociation(const DirectiveLanguage &DirLang,
D.getAssociation()->getName() + "'");
}
if (AS != Association::FromLeaves) {
- AsMap.insert(std::make_pair(R, AS));
+ AsMap.insert(std::pair(R, AS));
return AS;
}
// Compute the association from leaf constructs.
@@ -701,7 +701,7 @@ static void generateGetDirectiveAssociation(const DirectiveLanguage &DirLang,
assert(Result != Association::Invalid);
assert(Result != Association::FromLeaves);
- AsMap.insert(std::make_pair(R, Result));
+ AsMap.insert(std::pair(R, Result));
return Result;
};
diff --git a/llvm/utils/TableGen/Basic/RISCVTargetDefEmitter.cpp b/llvm/utils/TableGen/Basic/RISCVTargetDefEmitter.cpp
index 723f1d72b5159c..01500860112663 100644
--- a/llvm/utils/TableGen/Basic/RISCVTargetDefEmitter.cpp
+++ b/llvm/utils/TableGen/Basic/RISCVTargetDefEmitter.cpp
@@ -241,7 +241,7 @@ static void emitRISCVExtensionBitmask(const RecordKeeper &RK, raw_ostream &OS) {
ExtName.consume_front("experimental-");
#ifndef NDEBUG
- assert(Seen.insert(std::make_pair(GroupIDVal, BitPosVal)).second &&
+ assert(Seen.insert(std::pair(GroupIDVal, BitPosVal)).second &&
"duplicated bitmask");
#endif
diff --git a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
index 1a61d32b4869a4..f7f3de047d10d3 100644
--- a/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp
@@ -3006,7 +3006,7 @@ TreePatternNodePtr TreePattern::ParseTreePattern(const Init *TheInit,
// Check that the ComplexPattern uses are consistent: "(MY_PAT $a, $b)"
// and "(MY_PAT $b, $a)" should not be allowed in the same pattern;
// neither should "(MY_PAT_1 $a, $b)" and "(MY_PAT_2 $a, $b)".
- auto OperandId = std::make_pair(Operator, i);
+ auto OperandId = std::pair(Operator, i);
auto [PrevOp, Inserted] =
ComplexPatternOperands.try_emplace(Child->getName(), OperandId);
if (!Inserted && PrevOp->getValue() != OperandId) {
diff --git a/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp b/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp
index 149ba7a1d9032d..c55b1e66918e3c 100644
--- a/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp
+++ b/llvm/utils/TableGen/GlobalISelCombinerEmitter.cpp
@@ -2653,10 +2653,10 @@ GICombinerEmitter::buildMatchTable(MutableArrayRef<RuleMatcher> Rules) {
const Matcher *B) {
auto *L = static_cast<const RuleMatcher *>(A);
auto *R = static_cast<const RuleMatcher *>(B);
- return std::make_tuple(OpcodeOrder[L->getOpcode()],
- L->insnmatchers_front().getNumOperandMatchers()) <
- std::make_tuple(OpcodeOrder[R->getOpcode()],
- R->insnmatchers_front().getNumOperandMatchers());
+ return std::tuple(OpcodeOrder[L->getOpcode()],
+ L->insnmatchers_front().getNumOperandMatchers()) <
+ std::tuple(OpcodeOrder[R->getOpcode()],
+ R->insnmatchers_front().getNumOperandMatchers());
});
for (Matcher *Rule : InputRules)
diff --git a/llvm/utils/TableGen/OptionParserEmitter.cpp b/llvm/utils/TableGen/OptionParserEmitter.cpp
index eca828cad5f4d2..8973cef3ba3ef5 100644
--- a/llvm/utils/TableGen/OptionParserEmitter.cpp
+++ b/llvm/utils/TableGen/OptionParserEmitter.cpp
@@ -232,8 +232,7 @@ static void emitHelpTextsForVariants(
assert(Visibilities.size() <= MaxVisibilityPerHelp &&
"Too many visibilities to store in an "
"OptTable::HelpTextsForVariants entry");
- OS << "std::make_pair(std::array<unsigned, " << MaxVisibilityPerHelp
- << ">{{";
+ OS << "std::pair(std::array<unsigned, " << MaxVisibilityPerHelp << ">{{";
auto VisibilityEnd = Visibilities.cend();
for (auto Visibility = Visibilities.cbegin(); Visibility != VisibilityEnd;
@@ -516,8 +515,8 @@ static void emitOptionParser(const RecordKeeper &Records, raw_ostream &OS) {
for (const Init *Visibility : Visibilities)
VisibilityNames.push_back(Visibility->getAsUnquotedString());
- HelpTextsForVariants.push_back(std::make_pair(
- VisibilityNames, VisibilityHelp->getValueAsString("Text")));
+ HelpTextsForVariants.push_back(
+ std::pair(VisibilityNames, VisibilityHelp->getValueAsString("Text")));
}
emitHelpTextsForVariants(OS, std::move(HelpTextsForVariants));
|
arsenm
approved these changes
Jan 16, 2025
Right, I have made a bunch of follow up changes inspired by that. The patch is much bigger now... |
arsenm
approved these changes
Jan 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also use brace initialization and emplace to avoid explicitly
constructing std::pair, and the same for std::tuple.