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

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

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 45fde296e3cc13afc4f6659cfadd881f224a955f..2102073682da533b4093b1e88308b31dc1d4cf82 100644 (file)
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -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;

diff --git a/test/CXX/class/p2-0x.cpp b/test/CXX/class/p2-0x.cpp
index 1164b8f0a2f838e01db32f362f4f4d89f7757934..630aa7e70f90c338a619d7efc6dee8afc20d2d02 100644 (file)
--- a/test/CXX/class/p2-0x.cpp
+++ b/test/CXX/class/p2-0x.cpp
@@ -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'}}
+
+}
+