From 8fabd78f1976243cb223fb3e969c6f317d1ae44d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 4 May 2008 01:44:26 +0000 Subject: if a decl is both 'static' and weak or static and inline, its linkage type should be internal, not weak/linkonce. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50611 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index bf1f0d823d..306abd120b 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -459,17 +459,19 @@ void CodeGenModule::EmitGlobalVarInit(const VarDecl *D) { // FIXME: else handle -fvisibility // Set the llvm linkage type as appropriate. - if (D->getAttr()) + if (D->getStorageClass() == VarDecl::Static) + GV->setLinkage(llvm::Function::InternalLinkage); + else if (D->getAttr()) GV->setLinkage(llvm::Function::DLLImportLinkage); else if (D->getAttr()) GV->setLinkage(llvm::Function::DLLExportLinkage); - else if (D->getAttr()) { + else if (D->getAttr()) GV->setLinkage(llvm::GlobalVariable::WeakLinkage); - - } else { + else { // FIXME: This isn't right. This should handle common linkage and other // stuff. switch (D->getStorageClass()) { + case VarDecl::Static: assert(0 && "This case handled above"); case VarDecl::Auto: case VarDecl::Register: assert(0 && "Can't have auto or register globals"); @@ -481,9 +483,6 @@ void CodeGenModule::EmitGlobalVarInit(const VarDecl *D) { case VarDecl::PrivateExtern: // todo: common break; - case VarDecl::Static: - GV->setLinkage(llvm::GlobalVariable::InternalLinkage); - break; } } } -- cgit v1.2.3-70-g09d2