commit ece4758bf28b5be96ef0123ad79456a13e8518a1
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Jan 04 23:45:01 2017 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Jan 04 23:45:01 2017 +0000
tree 7e0b2b55ba718ac6bc98546707624ba8bdfb40db
parent dd9c27b3bf77b947ba0bb08ed1ba1ae673b9f067

Only instantiate members of nested classes in local classes once, rather than once per enclosing class.

llvm-svn: 291034

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 7328dcb..3cc9381 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1470,8 +1470,11 @@
                              TSK_ImplicitInstantiation,
                              /*Complain=*/true);
 
-    SemaRef.InstantiateClassMembers(D->getLocation(), Record, TemplateArgs,
-                                    TSK_ImplicitInstantiation);
+    // For nested local classes, we will instantiate the members when we
+    // reach the end of the outermost (non-nested) local class.
+    if (!D->isCXXClassMember())
+      SemaRef.InstantiateClassMembers(D->getLocation(), Record, TemplateArgs,
+                                      TSK_ImplicitInstantiation);
 
     // This class may have local implicit instantiations that need to be
     // performed within this scope.