Skip to content

Commit 39a8046

Browse files
authored
[NFC][TableGen] Use formatv automatic index in AsmWriterEmitter (#115966)
Use formatv automatic index assignment in AsmWriterEmitter.
1 parent 51e9609 commit 39a8046

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

llvm/utils/TableGen/AsmWriterEmitter.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -955,11 +955,11 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
955955
if (R->isSubClassOf("RegisterOperand"))
956956
R = R->getValueAsDef("RegClass");
957957
IAP.addCond(std::string(
958-
formatv("AliasPatternCond::K_RegClass, {0}::{1}RegClassID",
958+
formatv("AliasPatternCond::K_RegClass, {}::{}RegClassID",
959959
Namespace, R->getName())));
960960
} else {
961-
IAP.addCond(std::string(formatv(
962-
"AliasPatternCond::K_TiedReg, {0}", IAP.getOpIndex(ROName))));
961+
IAP.addCond(std::string(formatv("AliasPatternCond::K_TiedReg, {}",
962+
IAP.getOpIndex(ROName))));
963963
}
964964
} else {
965965
// Assume all printable operands are desired for now. This can be
@@ -977,7 +977,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
977977
break; // No conditions on this operand at all
978978
}
979979
IAP.addCond(
980-
std::string(formatv("AliasPatternCond::K_Custom, {0}", Entry)));
980+
std::string(formatv("AliasPatternCond::K_Custom, {}", Entry)));
981981
}
982982
break;
983983
}
@@ -990,19 +990,19 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
990990
PrintFatalError("Matching an alias with an immediate out of the "
991991
"range of int32_t is not supported");
992992
IAP.addCond(std::string(
993-
formatv("AliasPatternCond::K_Imm, uint32_t({0})", Imm32)));
993+
formatv("AliasPatternCond::K_Imm, uint32_t({})", Imm32)));
994994
break;
995995
}
996996
case CodeGenInstAlias::ResultOperand::K_Reg:
997997
if (!CGA.ResultOperands[i].getRegister()) {
998-
IAP.addCond(std::string(formatv(
999-
"AliasPatternCond::K_Reg, {0}::NoRegister", Namespace)));
998+
IAP.addCond(std::string(
999+
formatv("AliasPatternCond::K_Reg, {}::NoRegister", Namespace)));
10001000
break;
10011001
}
10021002

10031003
StringRef Reg = CGA.ResultOperands[i].getRegister()->getName();
10041004
IAP.addCond(std::string(
1005-
formatv("AliasPatternCond::K_Reg, {0}::{1}", Namespace, Reg)));
1005+
formatv("AliasPatternCond::K_Reg, {}::{}", Namespace, Reg)));
10061006
break;
10071007
}
10081008

@@ -1056,7 +1056,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
10561056
PrintFatalError(R->getLoc(), "Invalid AssemblerCondDag!");
10571057

10581058
IAP.addCond(std::string(formatv(
1059-
"AliasPatternCond::K_{0}{1}Feature, {2}::{3}", IsOr ? "Or" : "",
1059+
"AliasPatternCond::K_{}{}Feature, {}::{}", IsOr ? "Or" : "",
10601060
IsNeg ? "Neg" : "", Namespace, Arg->getAsString())));
10611061
}
10621062
// If an AssemblerPredicate with ors is used, note end of list should
@@ -1127,13 +1127,13 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
11271127
unsigned PatternStart = PatternCount;
11281128

11291129
// Insert the pattern start and opcode in the pattern list for debugging.
1130-
PatternO << formatv(" // {0} - {1}\n", It->first, PatternStart);
1130+
PatternO << formatv(" // {} - {}\n", It->first, PatternStart);
11311131

11321132
for (IAPrinter *IAP : UniqueIAPs) {
11331133
// Start each condition list with a comment of the resulting pattern that
11341134
// we're trying to match.
11351135
unsigned CondStart = CondCount;
1136-
CondO << formatv(" // {0} - {1}\n", IAP->getResult(), CondStart);
1136+
CondO << formatv(" // {} - {}\n", IAP->getResult(), CondStart);
11371137
for (const auto &Cond : IAP->getConds())
11381138
CondO << " {" << Cond << "},\n";
11391139
CondCount += IAP->getCondCount();
@@ -1151,12 +1151,12 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
11511151
}
11521152
unsigned AsmStrOffset = Insertion.first->second;
11531153

1154-
PatternO << formatv(" {{{0}, {1}, {2}, {3} },\n", AsmStrOffset,
1155-
CondStart, IAP->getNumMIOps(), IAP->getCondCount());
1154+
PatternO << formatv(" {{{}, {}, {}, {} },\n", AsmStrOffset, CondStart,
1155+
IAP->getNumMIOps(), IAP->getCondCount());
11561156
++PatternCount;
11571157
}
11581158

1159-
OpcodeO << formatv(" {{{0}, {1}, {2} },\n", It->first, PatternStart,
1159+
OpcodeO << formatv(" {{{}, {}, {} },\n", It->first, PatternStart,
11601160
PatternCount - PatternStart);
11611161
}
11621162

0 commit comments

Comments
 (0)