diff options
-rw-r--r-- | lib/AST/Decl.cpp | 2 | ||||
-rw-r--r-- | test/CodeGenCXX/visibility-inlines-hidden.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index c34d78c8a4..fea81cf2c4 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -193,7 +193,7 @@ static bool useInlineVisibilityHidden(const NamedDecl *D) { // anyway. return TSK != TSK_ExplicitInstantiationDeclaration && TSK != TSK_ExplicitInstantiationDefinition && - FD->hasBody(Def) && Def->isInlined(); + FD->hasBody(Def) && Def->isInlined() && !Def->hasAttr<GNUInlineAttr>(); } static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D, diff --git a/test/CodeGenCXX/visibility-inlines-hidden.cpp b/test/CodeGenCXX/visibility-inlines-hidden.cpp index 2bb13485e9..bf18020cc6 100644 --- a/test/CodeGenCXX/visibility-inlines-hidden.cpp +++ b/test/CodeGenCXX/visibility-inlines-hidden.cpp @@ -126,3 +126,12 @@ namespace test3 { // CHECK: define linkonce_odr hidden void @_ZN5test33fooEv // CHECK: define linkonce_odr hidden void @_ZN5test33zedIiEEvv } + +namespace test4 { + extern inline __attribute__ ((__gnu_inline__)) + void foo() {} + void bar() { + foo(); + } + // CHECK: define available_externally void @_ZN5test43fooE +} |