maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert 155102 but add a fixme while I debug what is wrong with chrome's 

components build.

llvm-svn: 155314
This commit is contained in:
Rafael Espindola 2012-04-22 12:37:27 +00:00
parent 8877d68db7
commit 6b6e879221
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/include/clang/AST/Decl.h
View File

@ -277,10 +277,16 @@ public:
if (visibility() < V) if (visibility() < V)
return; return;
// Don't lose the explicit bit for nothing // FIXME: this
if (visibility() == V && visibilityExplicit()) // If this visibility is explicit, keep it.
if (visibilityExplicit() && !E)
return; return;
// should be replaced with this
// Don't lose the explicit bit for nothing
// if (visibility() == V && visibilityExplicit())
// return;
setVisibility(V, E); setVisibility(V, E);
} }
void mergeVisibility(LinkageInfo Other) { void mergeVisibility(LinkageInfo Other) {

8
clang/test/CodeGenCXX/visibility.cpp
View File

@ -536,7 +536,9 @@ namespace PR10113 {
}; };
template class foo::bar<zed>; template class foo::bar<zed>;
// CHECK: define weak_odr void @_ZN7PR101133foo3barINS_3zedEE3zedEv // CHECK: define weak_odr void @_ZN7PR101133foo3barINS_3zedEE3zedEv
// CHECK-HIDDEN: define weak_odr hidden void @_ZN7PR101133foo3barINS_3zedEE3zedEv
// FIXME: This should be hidden as zed is hidden.
// CHECK-HIDDEN: define weak_odr void @_ZN7PR101133foo3barINS_3zedEE3zedEv
} }
namespace PR11690 { namespace PR11690 {
@ -567,7 +569,9 @@ namespace PR11690_2 {
}; };
template class foo::zed<baz>; template class foo::zed<baz>;
// CHECK: define weak_odr void @_ZN9PR11690_23foo3zedINS_3bazENS0_3barEE3barEv // CHECK: define weak_odr void @_ZN9PR11690_23foo3zedINS_3bazENS0_3barEE3barEv
// CHECK-HIDDEN: define weak_odr hidden void @_ZN9PR11690_23foo3zedINS_3bazENS0_3barEE3barEv
// FIXME: This should be hidden as baz is hidden.
// CHECK-HIDDEN: define weak_odr void @_ZN9PR11690_23foo3zedINS_3bazENS0_3barEE3barEv
} }
namespace test23 { namespace test23 {