[llvm] r327850 - TableGen: Explicitly forbid self-references to field members
Nicolai Haehnle via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 19 07:14:28 PDT 2018
Author: nha
Date: Mon Mar 19 07:14:28 2018
New Revision: 327850
URL: http://llvm.org/viewvc/llvm-project?rev=327850&view=rev
Log:
TableGen: Explicitly forbid self-references to field members
Summary:
Otherwise, patterns like in the test case produce cryptic error
messages about fields being resolved incompletely.
Change-Id: I713c0191f00fe140ad698675803ab1f8823dc5bd
Reviewers: arsenm, craig.topper, tra, MartinO
Subscribers: wdng, llvm-commits
Differential Revision: https://reviews.llvm.org/D44476
Added:
llvm/trunk/test/TableGen/self-reference-recursion.td
Modified:
llvm/trunk/include/llvm/TableGen/Record.h
llvm/trunk/lib/TableGen/Record.cpp
llvm/trunk/lib/TableGen/TGParser.cpp
Modified: llvm/trunk/include/llvm/TableGen/Record.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TableGen/Record.h?rev=327850&r1=327849&r2=327850&view=diff
==============================================================================
--- llvm/trunk/include/llvm/TableGen/Record.h (original)
+++ llvm/trunk/include/llvm/TableGen/Record.h Mon Mar 19 07:14:28 2018
@@ -1200,7 +1200,7 @@ public:
Init *getBit(unsigned Bit) const override;
Init *resolveReferences(Resolver &R) const override;
- Init *Fold() const;
+ Init *Fold(Record *CurRec) const;
std::string getAsString() const override {
return Rec->getAsString() + "." + FieldName->getValue().str();
Modified: llvm/trunk/lib/TableGen/Record.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/Record.cpp?rev=327850&r1=327849&r2=327850&view=diff
==============================================================================
--- llvm/trunk/lib/TableGen/Record.cpp (original)
+++ llvm/trunk/lib/TableGen/Record.cpp Mon Mar 19 07:14:28 2018
@@ -1684,13 +1684,19 @@ Init *FieldInit::getBit(unsigned Bit) co
Init *FieldInit::resolveReferences(Resolver &R) const {
Init *NewRec = Rec->resolveReferences(R);
if (NewRec != Rec)
- return FieldInit::get(NewRec, FieldName)->Fold();
+ return FieldInit::get(NewRec, FieldName)->Fold(R.getCurrentRecord());
return const_cast<FieldInit *>(this);
}
-Init *FieldInit::Fold() const {
+Init *FieldInit::Fold(Record *CurRec) const {
if (DefInit *DI = dyn_cast<DefInit>(Rec)) {
- Init *FieldVal = DI->getDef()->getValue(FieldName)->getValue();
+ Record *Def = DI->getDef();
+ if (Def == CurRec)
+ PrintFatalError(CurRec->getLoc(),
+ Twine("Attempting to access field '") +
+ FieldName->getAsUnquotedString() + "' of '" +
+ Rec->getAsString() + "' is a forbidden self-reference");
+ Init *FieldVal = Def->getValue(FieldName)->getValue();
if (FieldVal->isComplete())
return FieldVal;
}
Modified: llvm/trunk/lib/TableGen/TGParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/TGParser.cpp?rev=327850&r1=327849&r2=327850&view=diff
==============================================================================
--- llvm/trunk/lib/TableGen/TGParser.cpp (original)
+++ llvm/trunk/lib/TableGen/TGParser.cpp Mon Mar 19 07:14:28 2018
@@ -1943,7 +1943,7 @@ Init *TGParser::ParseValue(Record *CurRe
Result->getAsString() + "'");
return nullptr;
}
- Result = FieldInit::get(Result, FieldName)->Fold();
+ Result = FieldInit::get(Result, FieldName)->Fold(CurRec);
Lex.Lex(); // eat field name
break;
}
Added: llvm/trunk/test/TableGen/self-reference-recursion.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/self-reference-recursion.td?rev=327850&view=auto
==============================================================================
--- llvm/trunk/test/TableGen/self-reference-recursion.td (added)
+++ llvm/trunk/test/TableGen/self-reference-recursion.td Mon Mar 19 07:14:28 2018
@@ -0,0 +1,9 @@
+// RUN: not llvm-tblgen %s 2>&1 | FileCheck %s
+// XFAIL: vg_leak
+
+class A<string self> {
+ int x = !cast<A>(self).x;
+}
+
+// CHECK: error: Attempting to access field 'x' of 'A0' is a forbidden self-reference
+def A0 : A<"A0">;
More information about the llvm-commits
mailing list