Rename the CurMultiClass formal parameter of TGParser::AddSubMultiClass
so that it doesn't shadow the instance variable of the same name.
Make the parameter names in method declarations match the definitions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70502 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/TGParser.cpp b/utils/TableGen/TGParser.cpp
index 1907cf5..2e2ec31 100644
--- a/utils/TableGen/TGParser.cpp
+++ b/utils/TableGen/TGParser.cpp
@@ -196,14 +196,14 @@
}
/// AddSubMultiClass - Add SubMultiClass as a subclass to
-/// CurMultiClass, resolving its template args as SubMultiClass's
+/// CurMC, resolving its template args as SubMultiClass's
/// template arguments.
-bool TGParser::AddSubMultiClass(MultiClass *CurMultiClass,
+bool TGParser::AddSubMultiClass(MultiClass *CurMC,
SubMultiClassReference &SubMultiClass) {
MultiClass *SMC = SubMultiClass.MC;
- Record *CurRec = &CurMultiClass->Rec;
+ Record *CurRec = &CurMC->Rec;
- const std::vector<RecordVal> &MCVals = CurMultiClass->Rec.getValues();
+ const std::vector<RecordVal> &MCVals = CurRec->getValues();
// Add all of the values in the subclass into the current class.
const std::vector<RecordVal> &SMCVals = SMC->Rec.getValues();
@@ -211,7 +211,7 @@
if (AddValue(CurRec, SubMultiClass.RefLoc, SMCVals[i]))
return true;
- int newDefStart = CurMultiClass->DefPrototypes.size();
+ int newDefStart = CurMC->DefPrototypes.size();
// Add all of the defs in the subclass into the current multiclass.
for (MultiClass::RecordVector::const_iterator i = SMC->DefPrototypes.begin(),
@@ -226,7 +226,7 @@
if (AddValue(NewDef, SubMultiClass.RefLoc, MCVals[i]))
return true;
- CurMultiClass->DefPrototypes.push_back(NewDef);
+ CurMC->DefPrototypes.push_back(NewDef);
}
const std::vector<std::string> &SMCTArgs = SMC->Rec.getTemplateArgs();
@@ -257,8 +257,8 @@
// If a value is specified for this template arg, set it in the
// new defs now.
for (MultiClass::RecordVector::iterator j =
- CurMultiClass->DefPrototypes.begin() + newDefStart,
- jend = CurMultiClass->DefPrototypes.end();
+ CurMC->DefPrototypes.begin() + newDefStart,
+ jend = CurMC->DefPrototypes.end();
j != jend;
++j) {
Record *Def = *j;