From 616635022a7a15bf097e6c23fe2d2f5678491419 Mon Sep 17 00:00:00 2001 From: Nicolai Haehnle Date: Tue, 6 Mar 2018 13:49:06 +0000 Subject: [PATCH] TableGen: Remove the ResolveFirst mechanism Summary: It is no longer used. Change-Id: I1e47267d1975d43ad43acd6347f54e958e3b6c86 Reviewers: arsenm, craig.topper, tra, MartinO Subscribers: wdng, llvm-commits Differential Revision: https://reviews.llvm.org/D43757 llvm-svn: 326789 --- llvm/include/llvm/TableGen/Record.h | 22 +--------------------- llvm/lib/TableGen/TGParser.cpp | 6 ------ 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/llvm/include/llvm/TableGen/Record.h b/llvm/include/llvm/TableGen/Record.h index 8fed06b..ec8d2fc 100644 --- a/llvm/include/llvm/TableGen/Record.h +++ b/llvm/include/llvm/TableGen/Record.h @@ -1288,18 +1288,6 @@ class Record { bool IsAnonymous; - // Class-instance values can be used by other defs. For example, Struct - // is used here as a template argument to another class: - // - // multiclass MultiClass { - // def Def : Class>; - // - // These need to get fully resolved before instantiating any other - // definitions that use them (e.g. Def). However, inside a multiclass they - // can't be immediately resolved so we mark them ResolveFirst to fully - // resolve them later as soon as the multiclass is instantiated. - bool ResolveFirst = false; - void init(); void checkName(); @@ -1323,7 +1311,7 @@ public: Name(O.Name), Locs(O.Locs), TemplateArgs(O.TemplateArgs), Values(O.Values), SuperClasses(O.SuperClasses), TrackedRecords(O.TrackedRecords), ID(LastID++), - IsAnonymous(O.IsAnonymous), ResolveFirst(O.ResolveFirst) { } + IsAnonymous(O.IsAnonymous) { } static unsigned getNewUID() { return LastID++; } @@ -1461,14 +1449,6 @@ public: return IsAnonymous; } - bool isResolveFirst() const { - return ResolveFirst; - } - - void setResolveFirst(bool b) { - ResolveFirst = b; - } - void print(raw_ostream &OS) const; void dump() const; diff --git a/llvm/lib/TableGen/TGParser.cpp b/llvm/lib/TableGen/TGParser.cpp index 654b4fd..31b2c00 100644 --- a/llvm/lib/TableGen/TGParser.cpp +++ b/llvm/lib/TableGen/TGParser.cpp @@ -2722,12 +2722,6 @@ bool TGParser::ParseDefm(MultiClass *CurMultiClass) { if (ResolveMulticlassDef(*MC, CurRec, DefProto.get(), DefmLoc)) return Error(SubClassLoc, "could not instantiate def"); - // Defs that can be used by other definitions should be fully resolved - // before any use. - if (DefProto->isResolveFirst() && !CurMultiClass) { - CurRec->resolveReferences(); - CurRec->setResolveFirst(false); - } NewRecDefs.push_back(CurRec); } -- 2.7.4