commit ea7b4880bc07cd99b3994c2a95d722a06ab56594
author Abramo Bagnara <abramo.bagnara@gmail.com> Fri Jun 04 09:35:39 2010 +0000
committer Abramo Bagnara <abramo.bagnara@gmail.com> Fri Jun 04 09:35:39 2010 +0000
tree 27d1709c4f318d15690c07503bc941313f080ea1
parent a417b87e5d0f0508c7b18824d89d489bb55b7bd1

Don't insert in lexical context implicit definitions of static member instances.

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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 7981c3c..939f6ca 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -373,7 +373,8 @@
   SemaRef.CheckVariableDeclaration(Var, Previous, Redeclaration);
 
   if (D->isOutOfLine()) {
-    D->getLexicalDeclContext()->addDecl(Var);
+    if (!D->isStaticDataMember())
+      D->getLexicalDeclContext()->addDecl(Var);
     Owner->makeDeclVisibleInContext(Var);
   } else {
     Owner->addDecl(Var);