diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-03-08 15:51:03 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-03-08 15:51:03 +0000 |
| commit | 025039377d7247620750205dbd61ca1ba336f7e0 (patch) | |
| tree | 7a491638b2b4f3efd274424639b791a1ce3fedb3 /lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | 4fae2d9357a35acfb2c234c2b4ea69f63df71042 (diff) | |
Replace MarkVarRequired with a more generic
HandleCXXStaticMemberVarInstantiation. Suggested by Argyrios.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152320 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 4633db737a..7d2ec16cba 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2609,12 +2609,11 @@ void Sema::InstantiateStaticDataMemberDefinition( if (TSK == TSK_ExplicitInstantiationDeclaration) return; + Consumer.HandleCXXStaticMemberVarInstantiation(Var); + // If we already have a definition, we're done. - if (Var->getDefinition()) { - if (TSK == TSK_ExplicitInstantiationDefinition) - Consumer.MarkVarRequired(Var); + if (Var->getDefinition()) return; - } InstantiatingTemplate Inst(*this, PointOfInstantiation, Var); if (Inst) |