[llvm-commits] CVS: llvm/utils/TableGen/FileParser.y

[Chris Lattner]

Changes in directory llvm/utils/TableGen:

FileParser.y updated: 1.28 -> 1.29

---
Log message:

Do not remove an active template argument even if the superclass had one of the
same name


---
Diffs of the changes:  (+2 -1)

Index: llvm/utils/TableGen/FileParser.y
diff -u llvm/utils/TableGen/FileParser.y:1.28 llvm/utils/TableGen/FileParser.y:1.29
--- llvm/utils/TableGen/FileParser.y:1.28	Sat Feb 28 11:31:28 2004
+++ llvm/utils/TableGen/FileParser.y	Sat Feb 28 11:41:48 2004
@@ -467,7 +467,8 @@
   for (unsigned i = 0, e = $4->size(); i != e; ++i) {
     Record *SuperClass = (*$4)[i].first;
     for (unsigned i = 0, e = SuperClass->getTemplateArgs().size(); i != e; ++i)
-    CurRec->removeValue(SuperClass->getTemplateArgs()[i]);
+      if (!CurRec->isTemplateArg(SuperClass->getTemplateArgs()[i]))
+        CurRec->removeValue(SuperClass->getTemplateArgs()[i]);
   }
   delete $4;   // Delete the class list...