maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Mark classes final and/or explicit during class template instantiation. 

llvm-svn: 124040
This commit is contained in:
Anders Carlsson 2011-01-22 18:07:06 +00:00
parent fc1eef4898
commit c4964a40ba
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Sema/SemaTemplateInstantiate.cpp
View File

@ -1640,6 +1640,9 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation,
Instantiation->setTagKind(Pattern->getTagKind());
Instantiation->setIsMarkedFinal(Pattern->isMarkedFinal());
Instantiation->setIsMarkedExplicit(Pattern->isMarkedExplicit());
// Do substitution on the base class specifiers.
if (SubstBaseSpecifiers(Instantiation, Pattern, TemplateArgs))
Invalid = true;

20
clang/test/CXX/class/p2-0x.cpp
View File

@ -6,3 +6,23 @@ class B : A { }; // expected-error {{base 'A' is marked 'final'}}
}
namespace Test2 {
template<typename T> struct A final { }; // expected-note 2 {{'A' declared here}}
struct B : A<int> { }; // expected-error {{base 'A' is marked 'final'}}
template<typename T> struct C : A<T> { }; // expected-error {{base 'A' is marked 'final'}}
struct D : C<int> { }; // expected-note {{in instantiation of template class 'Test2::C<int>' requested here}}
}
namespace Test3 {
template<typename T> struct A { };
template<> struct A<int> final { }; // expected-note {{'A' declared here}}
struct B : A<bool> { };
struct C : A<int> { }; // expected-error {{base 'A' is marked 'final'}}
}