[llvm] [TableGen][NFC] Remove MultiClass argument and Scoper in QualifyName (PR #69297)
Wang Pengcheng via llvm-commits
llvm-commits at lists.llvm.org
Tue Oct 17 01:45:45 PDT 2023
https://github.com/wangpc-pp updated https://github.com/llvm/llvm-project/pull/69297
>From ef24909581e3d6122f8c1a9cfb2704d57aaccc4f Mon Sep 17 00:00:00 2001
From: wangpc <wangpengcheng.pp at bytedance.com>
Date: Tue, 17 Oct 2023 16:25:17 +0800
Subject: [PATCH 1/2] [TableGen][NFC] Remove MultiClass argument and Scoper in
QualifyName
MultiClass argument is not used any more since aa84326.
Besides, for maintainability, we should put the implementation of
qualifying name in one place (that is `QualifyName` function), so
`Scoper` is removed and we use `IsMC` to indicate that we are in a
multiclass.
---
llvm/lib/TableGen/TGParser.cpp | 46 ++++++++++++++++------------------
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/llvm/lib/TableGen/TGParser.cpp b/llvm/lib/TableGen/TGParser.cpp
index 2e61925f55651ea..7b8f9f8bbbcc994 100644
--- a/llvm/lib/TableGen/TGParser.cpp
+++ b/llvm/lib/TableGen/TGParser.cpp
@@ -111,11 +111,10 @@ static void checkConcrete(Record &R) {
/// Return an Init with a qualifier prefix referring
/// to CurRec's name.
-static Init *QualifyName(Record &CurRec, MultiClass *CurMultiClass, Init *Name,
- StringRef Scoper) {
+static Init *QualifyName(Record &CurRec, Init *Name, bool IsMC) {
RecordKeeper &RK = CurRec.getRecords();
- Init *NewName = BinOpInit::getStrConcat(CurRec.getNameInit(),
- StringInit::get(RK, Scoper));
+ Init *NewName = BinOpInit::getStrConcat(
+ CurRec.getNameInit(), StringInit::get(RK, IsMC ? "::" : ":"));
NewName = BinOpInit::getStrConcat(NewName, Name);
if (BinOpInit *BinOp = dyn_cast<BinOpInit>(NewName))
@@ -124,17 +123,15 @@ static Init *QualifyName(Record &CurRec, MultiClass *CurMultiClass, Init *Name,
}
/// Return the qualified version of the implicit 'NAME' template argument.
-static Init *QualifiedNameOfImplicitName(Record &Rec,
- MultiClass *MC = nullptr) {
- return QualifyName(Rec, MC, StringInit::get(Rec.getRecords(), "NAME"),
- MC ? "::" : ":");
+static Init *QualifiedNameOfImplicitName(Record &Rec, bool IsMC = false) {
+ return QualifyName(Rec, StringInit::get(Rec.getRecords(), "NAME"), IsMC);
}
static Init *QualifiedNameOfImplicitName(MultiClass *MC) {
- return QualifiedNameOfImplicitName(MC->Rec, MC);
+ return QualifiedNameOfImplicitName(MC->Rec, /*IsMC=*/true);
}
-Init *TGVarScope::getVar(RecordKeeper &Records, MultiClass* ParsingMultiClass,
+Init *TGVarScope::getVar(RecordKeeper &Records, MultiClass *ParsingMultiClass,
StringInit *Name, SMRange NameLoc,
bool TrackReferenceLocs) const {
// First, we search in local variables.
@@ -142,11 +139,11 @@ Init *TGVarScope::getVar(RecordKeeper &Records, MultiClass* ParsingMultiClass,
if (It != Vars.end())
return It->second;
- std::function<Init *(Record *, StringInit *, StringRef)> FindValueInArgs =
- [&](Record *Rec, StringInit *Name, StringRef Scoper) -> Init * {
+ std::function<Init *(Record *, StringInit *, bool)> FindValueInArgs =
+ [&](Record *Rec, StringInit *Name, bool IsMC) -> Init * {
if (!Rec)
return nullptr;
- Init *ArgName = QualifyName(*Rec, ParsingMultiClass, Name, Scoper);
+ Init *ArgName = QualifyName(*Rec, Name, IsMC);
if (Rec->isTemplateArg(ArgName)) {
RecordVal *RV = Rec->getValue(ArgName);
assert(RV && "Template arg doesn't exist??");
@@ -176,7 +173,7 @@ Init *TGVarScope::getVar(RecordKeeper &Records, MultiClass* ParsingMultiClass,
// The variable is a class template argument?
if (CurRec->isClass())
- if (auto *V = FindValueInArgs(CurRec, Name, ":"))
+ if (auto *V = FindValueInArgs(CurRec, Name, /*IsMC=*/false))
return V;
}
break;
@@ -193,7 +190,7 @@ Init *TGVarScope::getVar(RecordKeeper &Records, MultiClass* ParsingMultiClass,
case SK_MultiClass: {
// The variable is a multiclass template argument?
if (CurMultiClass)
- if (auto *V = FindValueInArgs(&CurMultiClass->Rec, Name, "::"))
+ if (auto *V = FindValueInArgs(&CurMultiClass->Rec, Name, /*IsMC=*/true))
return V;
break;
}
@@ -3168,8 +3165,7 @@ bool TGParser::ParseTemplateArgValueList(
"The name of named argument should be a valid identifier");
auto *Name = cast<StringInit>(Value);
- Init *QualifiedName =
- QualifyName(*ArgsRec, CurMultiClass, Name, IsDefm ? "::" : ":");
+ Init *QualifiedName = QualifyName(*ArgsRec, Name, /*IsMC=*/IsDefm);
auto *NamedArg = ArgsRec->getValue(QualifiedName);
if (!NamedArg)
return Error(ValueLoc,
@@ -3248,17 +3244,17 @@ Init *TGParser::ParseDeclaration(Record *CurRec,
RecordVal(DeclName, IdLoc, Type,
HasField ? RecordVal::FK_NonconcreteOK
: RecordVal::FK_Normal));
-
} else if (CurRec) { // class template argument
- DeclName = QualifyName(*CurRec, CurMultiClass, DeclName, ":");
- BadField = AddValue(CurRec, IdLoc, RecordVal(DeclName, IdLoc, Type,
- RecordVal::FK_TemplateArg));
-
+ DeclName = QualifyName(*CurRec, DeclName, /*IsMC=*/false);
+ BadField =
+ AddValue(CurRec, IdLoc,
+ RecordVal(DeclName, IdLoc, Type, RecordVal::FK_TemplateArg));
} else { // multiclass template argument
assert(CurMultiClass && "invalid context for template argument");
- DeclName = QualifyName(CurMultiClass->Rec, CurMultiClass, DeclName, "::");
- BadField = AddValue(CurRec, IdLoc, RecordVal(DeclName, IdLoc, Type,
- RecordVal::FK_TemplateArg));
+ DeclName = QualifyName(CurMultiClass->Rec, DeclName, /*IsMC=*/true);
+ BadField =
+ AddValue(CurRec, IdLoc,
+ RecordVal(DeclName, IdLoc, Type, RecordVal::FK_TemplateArg));
}
if (BadField)
return nullptr;
>From 87e957666791dc6d517d0cf92553570fa14e6c9f Mon Sep 17 00:00:00 2001
From: wangpc <wangpengcheng.pp at bytedance.com>
Date: Tue, 17 Oct 2023 16:45:15 +0800
Subject: [PATCH 2/2] fixup! [TableGen][NFC] Remove MultiClass argument and
Scoper in QualifyName
Add overloaded QualifyName for MultiClass
---
llvm/lib/TableGen/TGParser.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/TableGen/TGParser.cpp b/llvm/lib/TableGen/TGParser.cpp
index 7b8f9f8bbbcc994..2d073f926930b41 100644
--- a/llvm/lib/TableGen/TGParser.cpp
+++ b/llvm/lib/TableGen/TGParser.cpp
@@ -111,7 +111,7 @@ static void checkConcrete(Record &R) {
/// Return an Init with a qualifier prefix referring
/// to CurRec's name.
-static Init *QualifyName(Record &CurRec, Init *Name, bool IsMC) {
+static Init *QualifyName(Record &CurRec, Init *Name, bool IsMC = false) {
RecordKeeper &RK = CurRec.getRecords();
Init *NewName = BinOpInit::getStrConcat(
CurRec.getNameInit(), StringInit::get(RK, IsMC ? "::" : ":"));
@@ -122,6 +122,10 @@ static Init *QualifyName(Record &CurRec, Init *Name, bool IsMC) {
return NewName;
}
+static Init *QualifyName(MultiClass *MC, Init *Name) {
+ return QualifyName(MC->Rec, Name, /*IsMC=*/true);
+}
+
/// Return the qualified version of the implicit 'NAME' template argument.
static Init *QualifiedNameOfImplicitName(Record &Rec, bool IsMC = false) {
return QualifyName(Rec, StringInit::get(Rec.getRecords(), "NAME"), IsMC);
@@ -3245,13 +3249,13 @@ Init *TGParser::ParseDeclaration(Record *CurRec,
HasField ? RecordVal::FK_NonconcreteOK
: RecordVal::FK_Normal));
} else if (CurRec) { // class template argument
- DeclName = QualifyName(*CurRec, DeclName, /*IsMC=*/false);
+ DeclName = QualifyName(*CurRec, DeclName);
BadField =
AddValue(CurRec, IdLoc,
RecordVal(DeclName, IdLoc, Type, RecordVal::FK_TemplateArg));
} else { // multiclass template argument
assert(CurMultiClass && "invalid context for template argument");
- DeclName = QualifyName(CurMultiClass->Rec, DeclName, /*IsMC=*/true);
+ DeclName = QualifyName(CurMultiClass, DeclName);
BadField =
AddValue(CurRec, IdLoc,
RecordVal(DeclName, IdLoc, Type, RecordVal::FK_TemplateArg));
More information about the llvm-commits
mailing list