diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2011-02-01 05:45:26 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2011-02-01 05:45:26 +0000 |
| commit | 88ea6ab44f5ab3d3cc08d587b49389e516002113 (patch) | |
| tree | d8bf6d83bd46ec1af6113f3d70729bd061ec394a | |
| parent | 4a9b18d07b750cb28066f9fc4534ba1968768a6e (diff) | |
| download | bcm5719-llvm-88ea6ab44f5ab3d3cc08d587b49389e516002113.tar.gz bcm5719-llvm-88ea6ab44f5ab3d3cc08d587b49389e516002113.zip | |
Revert 124633. The linker has been told how to merge available_externally.
llvm-svn: 124651
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/visibility-hidden-extern-templates.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 00db2616498..b8f91b464dd 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -174,7 +174,8 @@ void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV, // Set visibility for definitions. NamedDecl::LinkageInfo LV = D->getLinkageAndVisibility(); - GV->setVisibility(GetLLVMVisibility(LV.visibility())); + if (LV.visibilityExplicit() || !GV->hasAvailableExternallyLinkage()) + GV->setVisibility(GetLLVMVisibility(LV.visibility())); } /// Set the symbol visibility of type information (vtable and RTTI) diff --git a/clang/test/CodeGenCXX/visibility-hidden-extern-templates.cpp b/clang/test/CodeGenCXX/visibility-hidden-extern-templates.cpp index eb87ff15672..7629b77c2ce 100644 --- a/clang/test/CodeGenCXX/visibility-hidden-extern-templates.cpp +++ b/clang/test/CodeGenCXX/visibility-hidden-extern-templates.cpp @@ -20,7 +20,7 @@ void test_X(X<int> xi, X<char> xc) { xi.g(); // CHECK: declare void @_ZN1XIcE1fEv xc.f(); - // CHECK: define available_externally hidden void @_ZN1XIcE1gEv + // CHECK: define available_externally void @_ZN1XIcE1gEv xc.g(); } |
