Skip to content

Revert "[clang] Handle instantiated members to determine visibility" #136317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

Revert "[clang] Handle instantiated members to determine visibility" #136317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions clang/lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@ void LinkageComputer::mergeTemplateLV(
FunctionTemplateDecl *temp = specInfo->getTemplate();
// Merge information from the template declaration.
LinkageInfo tempLV = getLVForDecl(temp, computation);
// The linkage and visibility of the specialization should be
// consistent with the template declaration.
LV.mergeMaybeWithVisibility(tempLV, considerVisibility);
// The linkage of the specialization should be consistent with the
// template declaration.
LV.setLinkage(tempLV.getLinkage());

// Merge information from the template parameters.
LinkageInfo paramsLV =
Expand Down Expand Up @@ -1051,13 +1051,6 @@ LinkageComputer::getLVForClassMember(const NamedDecl *D,
if (const auto *redeclTemp = dyn_cast<RedeclarableTemplateDecl>(temp)) {
if (isExplicitMemberSpecialization(redeclTemp)) {
explicitSpecSuppressor = temp->getTemplatedDecl();
} else if (const RedeclarableTemplateDecl *from =
redeclTemp->getInstantiatedFromMemberTemplate()) {
// If no explicit visibility is specified yet, and this is an
// instantiated member of a template, look up visibility there
// as well.
LinkageInfo fromLV = from->getLinkageAndVisibility();
LV.mergeMaybeWithVisibility(fromLV, considerVisibility);
}
}
}
Expand Down
38 changes: 1 addition & 37 deletions clang/test/CodeGenCXX/visibility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,45 +1457,9 @@ namespace test71 {
// CHECK-LABEL: declare hidden noundef i32 @_ZN6test713fooIiE3zedEv(
// CHECK-LABEL: define linkonce_odr noundef i32 @_ZN6test713fooIiE3barIiEET_v(
// CHECK-LABEL: define linkonce_odr hidden noundef i64 @_ZN6test713fooIlE3zedEv(
// CHECK-LABEL: define linkonce_odr hidden noundef i32 @_ZN6test713fooIlE3barIiEET_v(
// CHECK-LABEL: define linkonce_odr noundef i32 @_ZN6test713fooIlE3barIiEET_v(
// CHECK-HIDDEN-LABEL: declare hidden noundef i32 @_ZN6test713fooIiE3zedEv(
// CHECK-HIDDEN-LABEL: define linkonce_odr noundef i32 @_ZN6test713fooIiE3barIiEET_v(
// CHECK-HIDDEN-LABEL: define linkonce_odr hidden noundef i64 @_ZN6test713fooIlE3zedEv(
// CHECK-HIDDEN-LABEL: define linkonce_odr hidden noundef i32 @_ZN6test713fooIlE3barIiEET_v(
}

// https://github.com/llvm/llvm-project/issues/103477
namespace test72 {
template <class a>
struct t {
template <int>
static HIDDEN void bar() {}
};

void test() {
t<char>::bar<1>();
}
// CHECK-LABEL: define linkonce_odr hidden void @_ZN6test721tIcE3barILi1EEEvv(
// CHECK-HIDDEN-LABEL: define linkonce_odr hidden void @_ZN6test721tIcE3barILi1EEEvv(
}

// https://github.com/llvm/llvm-project/issues/31462
namespace test73 {
template <class T> struct s {
template <class U>
__attribute__((__visibility__("hidden"))) U should_not_be_exported();
};

template <class T> template <class U> U s<T>::should_not_be_exported() {
return U();
}

extern template struct __attribute__((__visibility__("default"))) s<int>;

int f() {
s<int> o;
return o.should_not_be_exported<int>();
}
// CHECK-LABEL: define linkonce_odr noundef i32 @_ZN6test731sIiE22should_not_be_exportedIiEET_v(
// CHECK-HIDDEN-LABEL: define linkonce_odr noundef i32 @_ZN6test731sIiE22should_not_be_exportedIiEET_v(
}
Loading