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

same name

llvm-svn: 11950
This commit is contained in:
Chris Lattner 2004-02-28 17:41:48 +00:00
parent 178f0f1405
commit 36326de312
1 changed files with 2 additions and 1 deletions

View File

@ -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...