From 8a4045e4d7495ac19935caf65cf39b8cc4e987b1 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 28 Feb 2004 17:41:48 +0000 Subject: [PATCH] Do not remove an active template argument even if the superclass had one of the same name git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11950 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/FileParser.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/TableGen/FileParser.y b/utils/TableGen/FileParser.y index d0f88c30c04..4731674e521 100644 --- a/utils/TableGen/FileParser.y +++ b/utils/TableGen/FileParser.y @@ -467,7 +467,8 @@ ObjectBody : OptID { 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... -- 2.34.1