Handle gnu_inline in c++ in a gcc compatible way. Original patch by Tobias

Grosser.

llvm-svn: 165720

2 files changed, 10 insertions, 1 deletions

diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index c34d78c8a4e..fea81cf2c45 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/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/clang/test/CodeGenCXX/visibility-inlines-hidden.cpp b/clang/test/CodeGenCXX/visibility-inlines-hidden.cpp
index 2bb13485e92..bf18020cc6e 100644
--- a/clang/test/CodeGenCXX/visibility-inlines-hidden.cpp
+++ b/clang/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
+}