forked from OSchip/llvm-project
[AST] Use -fvisibility value when ignoring -fv-i-h* inline static locals
Summary: In r340386 we added code to give static locals in inline functions default visibility. Instead, we should use the "default" visibility passed on the command line, which could be hidden or protected, as GCC does. Some code bases use both -fvisibility=hidden and -fvisibility-inlines-hidden to hide inline functions of classes that are explicitly marked with default visibility. Fixes PR39236 Reviewers: hans, thakis Subscribers: eraman, llvm-commits Differential Revision: https://reviews.llvm.org/D53052 llvm-svn: 344190
This commit is contained in:
Reid Kleckner
parent
b5421c498d
commit
a52d151f9d
|
|
@ -725,7 +725,7 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
|
|||
// If we're paying attention to global visibility, apply
|
||||
// -finline-visibility-hidden if this is an inline method.
|
||||
if (useInlineVisibilityHidden(D))
|
||||
LV.mergeVisibility(HiddenVisibility, true);
|
||||
LV.mergeVisibility(HiddenVisibility, /*visibilityExplicit=*/false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -915,7 +915,7 @@ LinkageComputer::getLVForClassMember(const NamedDecl *D,
|
|||
// Note that we do this before merging information about
|
||||
// the class visibility.
|
||||
if (!LV.isVisibilityExplicit() && useInlineVisibilityHidden(D))
|
||||
LV.mergeVisibility(HiddenVisibility, true);
|
||||
LV.mergeVisibility(HiddenVisibility, /*visibilityExplicit=*/false);
|
||||
}
|
||||
|
||||
// If this class member has an explicit visibility attribute, the only
|
||||
|
|
@ -1265,14 +1265,24 @@ LinkageInfo LinkageComputer::getLVForLocalDecl(const NamedDecl *D,
|
|||
// If a function is hidden by -fvisibility-inlines-hidden option and
|
||||
// is not explicitly attributed as a hidden function,
|
||||
// we should not make static local variables in the function hidden.
|
||||
if (isa<VarDecl>(D) && useInlineVisibilityHidden(FD) &&
|
||||
!(!hasExplicitVisibilityAlready(computation) &&
|
||||
getExplicitVisibility(FD, computation))) {
|
||||
assert(cast<VarDecl>(D)->isStaticLocal());
|
||||
return LinkageInfo(VisibleNoLinkage, DefaultVisibility, false);
|
||||
}
|
||||
|
||||
LV = getLVForDecl(FD, computation);
|
||||
if (isa<VarDecl>(D) && useInlineVisibilityHidden(FD) &&
|
||||
!LV.isVisibilityExplicit()) {
|
||||
assert(cast<VarDecl>(D)->isStaticLocal());
|
||||
// If this was an implicitly hidden inline method, check again for
|
||||
// explicit visibility on the parent class, and use that for static locals
|
||||
// if present.
|
||||
if (const auto *MD = dyn_cast<CXXMethodDecl>(FD))
|
||||
LV = getLVForDecl(MD->getParent(), computation);
|
||||
if (!LV.isVisibilityExplicit()) {
|
||||
Visibility globalVisibility =
|
||||
computation.isValueVisibility()
|
||||
? Context.getLangOpts().getValueVisibilityMode()
|
||||
: Context.getLangOpts().getTypeVisibilityMode();
|
||||
return LinkageInfo(VisibleNoLinkage, globalVisibility,
|
||||
/*visibilityExplicit=*/false);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isExternallyVisible(LV.getLinkage()))
|
||||
return LinkageInfo::none();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 -fvisibility-inlines-hidden -emit-llvm -o - %s -O2 -disable-llvm-passes | FileCheck %s
|
||||
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 -emit-llvm -o - %s -O2 -disable-llvm-passes | FileCheck -check-prefixes=CHECK-NO-VIH %s
|
||||
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 -fvisibility hidden -fvisibility-inlines-hidden -emit-llvm -o - %s -O2 -disable-llvm-passes | FileCheck %s --check-prefix=CHECK-VIS-HIDDEN
|
||||
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 -fvisibility protected -fvisibility-inlines-hidden -emit-llvm -o - %s -O2 -disable-llvm-passes | FileCheck %s --check-prefix=CHECK-VIS-PROTECTED
|
||||
|
||||
// When a function is hidden due to -fvisibility-inlines-hidden option, static local variables of the function should not be hidden by the option.
|
||||
|
||||
|
|
@ -9,12 +11,15 @@
|
|||
// CHECK-DAG: @_ZZ11inline_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-DAG: @_ZZ18inline_hidden_funcvE3var = linkonce_odr hidden global i32 0, comdat
|
||||
// CHECK-DAG: @_ZZ19inline_default_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-DAG: @_ZZN13ExportedClass10inl_methodEvE3var = linkonce_odr global i32 0, comdat, align 4
|
||||
// CHECK-DAG: define i32 @_Z4funcv()
|
||||
// CHECK-DAG: define hidden i32 @_Z11hidden_funcv()
|
||||
// CHECK-DAG: define i32 @_Z12default_funcv()
|
||||
// CHECK-DAG: define linkonce_odr hidden i32 @_Z11inline_funcv()
|
||||
// CHECK-DAG: define linkonce_odr hidden i32 @_Z18inline_hidden_funcv()
|
||||
// CHECK-DAG: define linkonce_odr i32 @_Z19inline_default_funcv()
|
||||
// CHECK-DAG: define linkonce_odr hidden i32 @_ZN13ExportedClass10inl_methodEv({{.*}})
|
||||
// CHECK-DAG: define i32 @_ZN13ExportedClass10ext_methodEv({{.*}})
|
||||
|
||||
// CHECK-NO-VIH-DAG: @_ZZ4funcvE3var = internal global i32 0
|
||||
// CHECK-NO-VIH-DAG: @_ZZ11hidden_funcvE3var = internal global i32 0
|
||||
|
|
@ -22,13 +27,47 @@
|
|||
// CHECK-NO-VIH-DAG: @_ZZ11inline_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-NO-VIH-DAG: @_ZZ18inline_hidden_funcvE3var = linkonce_odr hidden global i32 0, comdat
|
||||
// CHECK-NO-VIH-DAG: @_ZZ19inline_default_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-NO-VIH-DAG: @_ZZN13ExportedClass10inl_methodEvE3var = linkonce_odr global i32 0, comdat, align 4
|
||||
// CHECK-NO-VIH-DAG: define i32 @_Z4funcv()
|
||||
// CHECK-NO-VIH-DAG: define hidden i32 @_Z11hidden_funcv()
|
||||
// CHECK-NO-VIH-DAG: define i32 @_Z12default_funcv()
|
||||
// CHECK-NO-VIH-DAG: define linkonce_odr i32 @_Z11inline_funcv()
|
||||
// CHECK-NO-VIH-DAG: define linkonce_odr hidden i32 @_Z18inline_hidden_funcv()
|
||||
// CHECK-NO-VIH-DAG: define linkonce_odr i32 @_Z19inline_default_funcv()
|
||||
// CHECK-NO-VIH-DAG: define linkonce_odr i32 @_ZN13ExportedClass10inl_methodEv({{.*}})
|
||||
// CHECK-NO-VIH-DAG: define i32 @_ZN13ExportedClass10ext_methodEv({{.*}})
|
||||
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ4funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ11hidden_funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ12default_funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ11inline_funcvE3var = linkonce_odr hidden global i32 0, comdat
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ18inline_hidden_funcvE3var = linkonce_odr hidden global i32 0, comdat
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZ19inline_default_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-VIS-HIDDEN-DAG: @_ZZN13ExportedClass10inl_methodEvE3var = linkonce_odr global i32 0, comdat, align 4
|
||||
// CHECK-VIS-HIDDEN-DAG: define hidden i32 @_Z4funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define hidden i32 @_Z11hidden_funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define i32 @_Z12default_funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define linkonce_odr hidden i32 @_Z11inline_funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define linkonce_odr hidden i32 @_Z18inline_hidden_funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define linkonce_odr i32 @_Z19inline_default_funcv()
|
||||
// CHECK-VIS-HIDDEN-DAG: define linkonce_odr hidden i32 @_ZN13ExportedClass10inl_methodEv({{.*}})
|
||||
// CHECK-VIS-HIDDEN-DAG: define i32 @_ZN13ExportedClass10ext_methodEv({{.*}})
|
||||
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ4funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ11hidden_funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ12default_funcvE3var = internal global i32 0
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ11inline_funcvE3var = linkonce_odr protected global i32 0, comdat
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ18inline_hidden_funcvE3var = linkonce_odr hidden global i32 0, comdat
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZ19inline_default_funcvE3var = linkonce_odr global i32 0, comdat
|
||||
// CHECK-VIS-PROTECTED-DAG: @_ZZN13ExportedClass10inl_methodEvE3var = linkonce_odr global i32 0, comdat, align 4
|
||||
// CHECK-VIS-PROTECTED-DAG: define protected i32 @_Z4funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define hidden i32 @_Z11hidden_funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define i32 @_Z12default_funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define linkonce_odr hidden i32 @_Z11inline_funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define linkonce_odr hidden i32 @_Z18inline_hidden_funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define linkonce_odr i32 @_Z19inline_default_funcv()
|
||||
// CHECK-VIS-PROTECTED-DAG: define linkonce_odr hidden i32 @_ZN13ExportedClass10inl_methodEv({{.*}})
|
||||
// CHECK-VIS-PROTECTED-DAG: define i32 @_ZN13ExportedClass10ext_methodEv({{.*}})
|
||||
|
||||
int func(void) {
|
||||
static int var = 0;
|
||||
|
|
@ -54,6 +93,14 @@ inline int __attribute__((visibility("default"))) inline_default_func(void) {
|
|||
static int var = 0;
|
||||
return var++;
|
||||
}
|
||||
struct __attribute__((visibility("default"))) ExportedClass {
|
||||
int inl_method() {
|
||||
static int var = 0;
|
||||
return var++;
|
||||
}
|
||||
int ext_method();
|
||||
};
|
||||
int ExportedClass::ext_method() { return inl_method(); }
|
||||
void bar(void) {
|
||||
func();
|
||||
inline_func();
|
||||
|
|
@ -62,4 +109,3 @@ void bar(void) {
|
|||
default_func();
|
||||
inline_default_func();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue