Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TableGen][NFC] Remove MultiClass argument and Scoper in QualifyName #69297

Merged
merged 3 commits into from
Oct 23, 2023
Merged

[TableGen][NFC] Remove MultiClass argument and Scoper in QualifyName #69297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef24909
[TableGen][NFC] Remove MultiClass argument and Scoper in QualifyName
wangpc-pp Oct 17, 2023
87e9576
fixup! [TableGen][NFC] Remove MultiClass argument and Scoper in Quali…
wangpc-pp Oct 17, 2023
cf82110
fixup! [TableGen][NFC] Remove MultiClass argument and Scoper in Quali…
wangpc-pp Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 25 additions & 25 deletions llvm/lib/TableGen/TGParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,42 +111,43 @@ 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 = false) {
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))
NewName = BinOp->Fold(&CurRec);
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,
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.
auto It = Vars.find(Name->getValue());
if (It != Vars.end())
return It->second;

std::function<Init *(Record *, StringInit *, StringRef)> FindValueInArgs =
[&](Record *Rec, StringInit *Name, StringRef Scoper) -> Init * {
auto 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??");
Expand Down Expand Up @@ -176,7 +177,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;
Expand All @@ -193,7 +194,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;
}
Expand Down Expand Up @@ -3168,8 +3169,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,
Expand Down Expand Up @@ -3248,17 +3248,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);
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, DeclName);
BadField =
AddValue(CurRec, IdLoc,
RecordVal(DeclName, IdLoc, Type, RecordVal::FK_TemplateArg));
}
if (BadField)
return nullptr;
Expand Down