[llvm] b167303 - [TableGen] Use range-based for loops (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 1 20:55:29 PST 2021
Author: Kazu Hirata
Date: 2021-02-01T20:55:09-08:00
New Revision: b167303b772d1d07fb831b2110cd26d541138bf7
URL: https://github.com/llvm/llvm-project/commit/b167303b772d1d07fb831b2110cd26d541138bf7
DIFF: https://github.com/llvm/llvm-project/commit/b167303b772d1d07fb831b2110cd26d541138bf7.diff
LOG: [TableGen] Use range-based for loops (NFC)
Added:
Modified:
llvm/utils/TableGen/AsmMatcherEmitter.cpp
llvm/utils/TableGen/CodeEmitterGen.cpp
llvm/utils/TableGen/CodeGenDAGPatterns.cpp
llvm/utils/TableGen/CodeGenRegisters.h
llvm/utils/TableGen/DAGISelEmitter.cpp
llvm/utils/TableGen/SubtargetEmitter.cpp
Removed:
################################################################################
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index 8b30fd709dd9..147fd5c9b9b2 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -1100,8 +1100,8 @@ bool MatchableInfo::validate(StringRef CommentDelimiter, bool IsAlias) const {
static std::string getEnumNameForToken(StringRef Str) {
std::string Res;
- for (StringRef::iterator it = Str.begin(), ie = Str.end(); it != ie; ++it) {
- switch (*it) {
+ for (char C : Str) {
+ switch (C) {
case '*': Res += "_STAR_"; break;
case '%': Res += "_PCT_"; break;
case ':': Res += "_COLON_"; break;
@@ -1112,10 +1112,10 @@ static std::string getEnumNameForToken(StringRef Str) {
case '-': Res += "_MINUS_"; break;
case '#': Res += "_HASH_"; break;
default:
- if (isAlnum(*it))
- Res += *it;
+ if (isAlnum(C))
+ Res += C;
else
- Res += "_" + utostr((unsigned) *it) + "_";
+ Res += "_" + utostr((unsigned)C) + "_";
}
}
diff --git a/llvm/utils/TableGen/CodeEmitterGen.cpp b/llvm/utils/TableGen/CodeEmitterGen.cpp
index 53bf953b13cf..3b77f09d9b79 100644
--- a/llvm/utils/TableGen/CodeEmitterGen.cpp
+++ b/llvm/utils/TableGen/CodeEmitterGen.cpp
@@ -461,9 +461,7 @@ void CodeEmitterGen::run(raw_ostream &o) {
std::map<std::string, std::vector<std::string>> CaseMap;
// Construct all cases statement for each opcode
- for (std::vector<Record*>::iterator IC = Insts.begin(), EC = Insts.end();
- IC != EC; ++IC) {
- Record *R = *IC;
+ for (Record *R : Insts) {
if (R->getValueAsString("Namespace") == "TargetOpcode" ||
R->getValueAsBit("isPseudo"))
continue;
diff --git a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
index 01a6335a1632..669b3d367fde 100644
--- a/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
+++ b/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
@@ -4032,8 +4032,7 @@ void CodeGenDAGPatterns::InferInstructionFlags() {
/// Verify instruction flags against pattern node properties.
void CodeGenDAGPatterns::VerifyInstructionFlags() {
unsigned Errors = 0;
- for (ptm_iterator I = ptm_begin(), E = ptm_end(); I != E; ++I) {
- const PatternToMatch &PTM = *I;
+ for (const PatternToMatch &PTM : ptms()) {
SmallVector<Record*, 8> Instrs;
getInstructionsInTree(PTM.getDstPattern(), Instrs);
if (Instrs.empty())
diff --git a/llvm/utils/TableGen/CodeGenRegisters.h b/llvm/utils/TableGen/CodeGenRegisters.h
index f1712d663dd0..6a0696011a40 100644
--- a/llvm/utils/TableGen/CodeGenRegisters.h
+++ b/llvm/utils/TableGen/CodeGenRegisters.h
@@ -738,9 +738,8 @@ namespace llvm {
// Get the sum of unit weights.
unsigned getRegUnitSetWeight(const std::vector<unsigned> &Units) const {
unsigned Weight = 0;
- for (std::vector<unsigned>::const_iterator
- I = Units.begin(), E = Units.end(); I != E; ++I)
- Weight += getRegUnit(*I).Weight;
+ for (unsigned Unit : Units)
+ Weight += getRegUnit(Unit).Weight;
return Weight;
}
diff --git a/llvm/utils/TableGen/DAGISelEmitter.cpp b/llvm/utils/TableGen/DAGISelEmitter.cpp
index 32ed0bf98743..b9762f9972af 100644
--- a/llvm/utils/TableGen/DAGISelEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelEmitter.cpp
@@ -153,9 +153,8 @@ void DAGISelEmitter::run(raw_ostream &OS) {
// Add all the patterns to a temporary list so we can sort them.
Records.startTimer("Sort patterns");
std::vector<const PatternToMatch*> Patterns;
- for (CodeGenDAGPatterns::ptm_iterator I = CGP.ptm_begin(), E = CGP.ptm_end();
- I != E; ++I)
- Patterns.push_back(&*I);
+ for (const PatternToMatch &PTM : CGP.ptms())
+ Patterns.push_back(&PTM);
// We want to process the matches in order of minimal cost. Sort the patterns
// so the least cost one is at the start.
diff --git a/llvm/utils/TableGen/SubtargetEmitter.cpp b/llvm/utils/TableGen/SubtargetEmitter.cpp
index 7d2b4b929df3..94cde1c12b89 100644
--- a/llvm/utils/TableGen/SubtargetEmitter.cpp
+++ b/llvm/utils/TableGen/SubtargetEmitter.cpp
@@ -179,8 +179,8 @@ void SubtargetEmitter::Enumeration(raw_ostream &OS,
static void printFeatureMask(raw_ostream &OS, RecVec &FeatureList,
const DenseMap<Record *, unsigned> &FeatureMap) {
std::array<uint64_t, MAX_SUBTARGET_WORDS> Mask = {};
- for (unsigned j = 0, M = FeatureList.size(); j < M; ++j) {
- unsigned Bit = FeatureMap.lookup(FeatureList[j]);
+ for (const Record *Feature : FeatureList) {
+ unsigned Bit = FeatureMap.lookup(Feature);
Mask[Bit / 64] |= 1ULL << (Bit % 64);
}
@@ -215,10 +215,8 @@ unsigned SubtargetEmitter::FeatureKeyValues(
// For each feature
unsigned NumFeatures = 0;
- for (unsigned i = 0, N = FeatureList.size(); i < N; ++i) {
+ for (const Record *Feature : FeatureList) {
// Next feature
- Record *Feature = FeatureList[i];
-
StringRef Name = Feature->getName();
StringRef CommandLineName = Feature->getValueAsString("Name");
StringRef Desc = Feature->getValueAsString("Desc");
More information about the llvm-commits
mailing list