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/CodeGen/CodeGenModule.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/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index b2bfab055b..0399ec479e 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1722,8 +1722,12 @@ static void ReplaceUsesOfNonProtoTypeWithRealFunction(llvm::GlobalValue *Old, } } -void CodeGenModule::MarkVarRequired(VarDecl *VD) { - GetAddrOfGlobalVar(VD); +void CodeGenModule::HandleCXXStaticMemberVarInstantiation(VarDecl *VD) { + TemplateSpecializationKind TSK = VD->getTemplateSpecializationKind(); + // If we have a definition, this might be a deferred decl. If the + // instantiation is explicit, make sure we emit it at the end. + if (VD->getDefinition() && TSK == TSK_ExplicitInstantiationDefinition) + GetAddrOfGlobalVar(VD); } void CodeGenModule::EmitGlobalFunctionDefinition(GlobalDecl GD) { |