From 796d4a885d9ae896d92c838c5d49adc7ef645e62 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 2 Mar 2018 01:29:51 +0000 Subject: Always set dso_local in CodeGenModule::setDSOLocal. This shouldn't change any results for now, but is more consistent with how we set dllimport/dllexport and will make future changes easier. Since clang produces IR as it parses, it can find out mid file that something is dllimport. When that happens we have to drop dso_local. This is not a problem right now because CodeGenModule::setDSOLocal is called from relatively few places at the moment. llvm-svn: 326527 --- clang/lib/CodeGen/CodeGenModule.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 389f586443c8..de3810554f9e 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -716,6 +716,12 @@ void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV, static bool shouldAssumeDSOLocal(const CodeGenModule &CGM, llvm::GlobalValue *GV) { + if (GV->hasLocalLinkage()) + return true; + + if (!GV->hasDefaultVisibility() && !GV->hasExternalWeakLinkage()) + return true; + // DLLImport explicitly marks the GV as external. if (GV->hasDLLImportStorageClass()) return false; @@ -773,8 +779,7 @@ static bool shouldAssumeDSOLocal(const CodeGenModule &CGM, } void CodeGenModule::setDSOLocal(llvm::GlobalValue *GV) const { - if (shouldAssumeDSOLocal(*this, GV)) - GV->setDSOLocal(true); + GV->setDSOLocal(shouldAssumeDSOLocal(*this, GV)); } void CodeGenModule::setDLLImportDLLExport(llvm::GlobalValue *GV, -- cgit v1.2.3