Implement TODO: disallow 'def's with template arguments.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7409 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/support/tools/TableGen/FileParser.y b/support/tools/TableGen/FileParser.y
index 7a374e178fd09106d0d87b4a9ea1121d6e875f0c..6ebcf7691b1a0e90f50eb44e35533adc8b5e8a41 100644 (file)
--- a/support/tools/TableGen/FileParser.y
+++ b/support/tools/TableGen/FileParser.y
@@ -432,7 +432,12 @@ ClassInst : CLASS ObjectBody {
 };
 
 DefInst : DEF ObjectBody {
-  // TODO: If ObjectBody has template arguments, it's an error.
+  if (!$2->getTemplateArgs().empty()) {
+    err() << "Def '" << $2->getName()
+          << "' is not permitted to have template arguments!\n";
+    abort();
+  }
+  // If ObjectBody has template arguments, it's an error.
   if (Records.getDef($2->getName())) {
     err() << "Def '" << $2->getName() << "' already defined!\n";
     abort();

diff --git a/utils/TableGen/FileParser.y b/utils/TableGen/FileParser.y
index 7a374e178fd09106d0d87b4a9ea1121d6e875f0c..6ebcf7691b1a0e90f50eb44e35533adc8b5e8a41 100644 (file)
--- a/utils/TableGen/FileParser.y
+++ b/utils/TableGen/FileParser.y
@@ -432,7 +432,12 @@ ClassInst : CLASS ObjectBody {
 };
 
 DefInst : DEF ObjectBody {
-  // TODO: If ObjectBody has template arguments, it's an error.
+  if (!$2->getTemplateArgs().empty()) {
+    err() << "Def '" << $2->getName()
+          << "' is not permitted to have template arguments!\n";
+    abort();
+  }
+  // If ObjectBody has template arguments, it's an error.
   if (Records.getDef($2->getName())) {
     err() << "Def '" << $2->getName() << "' already defined!\n";
     abort();