5 files changed, 23 insertions, 25 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 7c49cfbd671..db4fa2a4fa5 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -414,8 +414,6 @@ def warn_attribute_wrong_decl_type : Warning<
 def warn_gnu_inline_attribute_requires_inline : Warning<
   "'gnu_inline' attribute requires function to be marked 'inline',"
   " attribute ignored">;
-def warn_gnu_inline_attribute_extern_inline : Warning<
- "'gnu_inline' attribute is overridden by 'extern inline', attribute ignored">;
 
 def warn_attribute_ignored_for_field_of_type : Warning<
   "%0 attribute ignored for field of type %1">;
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 80e4bd9f9bb..ba0b28ac975 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -238,30 +238,27 @@ GetLinkageForFunction(const FunctionDecl *FD, const LangOptions &Features) {
   if (!FD->isInline())
     return CodeGenModule::GVA_StrongExternal;
   
-  // If the inline function explicitly has the GNU inline attribute on it, then
-  // force to GNUC semantics (which is strong external), regardless of language.
-  if (FD->hasAttr<GNUInlineAttr>())
+  // If the inline function explicitly has the GNU inline attribute on it, or if
+  // this is C89 mode, we use to GNU semantics.
+  if (FD->hasAttr<GNUInlineAttr>() || (!Features.C99 && !Features.CPlusPlus)) {
+    // extern inline in GNU mode is like C99 inline.
+    if (FD->getStorageClass() == FunctionDecl::Extern)
+      return CodeGenModule::GVA_C99Inline;
+    // Normal inline is a strong symbol.
     return CodeGenModule::GVA_StrongExternal;
+  }
 
   // The definition of inline changes based on the language.  Note that we
   // have already handled "static inline" above, with the GVA_Internal case.
   if (Features.CPlusPlus)  // inline and extern inline.
     return CodeGenModule::GVA_CXXInline;
   
-  if (FD->getStorageClass() == FunctionDecl::Extern) {
-    // extern inline in C99 is a strong definition. In C89, it is extern inline.
-    if (Features.C99)
-      return CodeGenModule::GVA_StrongExternal;
-    
-    // In C89 mode, an 'extern inline' works like a C99 inline function.
-    return CodeGenModule::GVA_C99Inline;
-  }
-  
-  if (Features.C99)
-    return CodeGenModule::GVA_C99Inline;
+  assert(Features.C99 && "Must be in C99 mode if not in C89 or C++ mode");
+  // extern inline in C99 is a strong definition.
+  if (FD->getStorageClass() == FunctionDecl::Extern) 
+    return CodeGenModule::GVA_StrongExternal;
   
-  // Otherwise, this is the GNU inline extension in K&R and GNU C89 mode.
-  return CodeGenModule::GVA_StrongExternal;
+  return CodeGenModule::GVA_C99Inline;
 }
 
 /// SetFunctionDefinitionAttributes - Set attributes for a global.
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 290c58ea8a5..d0c0ab86e1b 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1474,11 +1474,6 @@ static void HandleGNUInlineAttr(Decl *d, const AttributeList &Attr, Sema &S) {
     return;
   }
   
-  if (Fn->getStorageClass() == FunctionDecl::Extern) {
-    S.Diag(Attr.getLoc(), diag::warn_gnu_inline_attribute_extern_inline);
-    return;
-  }
-  
   d->addAttr(::new (S.Context) GNUInlineAttr());
 }
 
diff --git a/clang/test/CodeGen/inline.c b/clang/test/CodeGen/inline.c
index 48219887339..eb8ee718d32 100644
--- a/clang/test/CodeGen/inline.c
+++ b/clang/test/CodeGen/inline.c
@@ -6,6 +6,7 @@
 // RUN: grep "define void @unreferenced1()" %t &&
 // RUN: not grep unreferenced2 %t &&
 // RUN: grep "define void @gnu_inline()" %t &&
+// RUN: grep "define available_externally void @gnu_ei_inline()" %t &&
 
 // RUN: echo "\nC99 tests:" &&
 // RUN: clang %s -emit-llvm -S -o %t -std=c99 &&
@@ -15,6 +16,7 @@
 // RUN: not grep unreferenced1 %t &&
 // RUN: grep "define void @unreferenced2()" %t &&
 // RUN: grep "define void @gnu_inline()" %t &&
+// RUN: grep "define available_externally void @gnu_ei_inline()" %t &&
 
 // RUN: echo "\nC++ tests:" &&
 // RUN: clang %s -emit-llvm -S -o %t -std=c++98 &&
@@ -22,7 +24,8 @@
 // RUN: grep "define linkonce_odr i32 @_Z3foov()" %t &&
 // RUN: grep "define i32 @_Z3barv()" %t &&
 // RUN: not grep unreferenced %t &&
-// RUN: grep "define void @_Z10gnu_inlinev()" %t
+// RUN: grep "define void @_Z10gnu_inlinev()" %t &&
+// RUN: grep "define available_externally void @_Z13gnu_ei_inlinev()" %t
 
 extern inline int ei() { return 123; }
 
@@ -37,3 +40,8 @@ inline void unreferenced1() {}
 extern inline void unreferenced2() {}
 
 __inline __attribute((__gnu_inline__)) void gnu_inline() {}
+
+// PR3988
+extern inline __attribute__((gnu_inline)) void gnu_ei_inline() {}
+void (*P)() = gnu_ei_inline;
+
diff --git a/clang/test/Sema/function.c b/clang/test/Sema/function.c
index fa998300fef..77557c94085 100644
--- a/clang/test/Sema/function.c
+++ b/clang/test/Sema/function.c
@@ -64,7 +64,7 @@ struct incomplete_test a(void) {} // expected-error{{incomplete result type 'str
 
 
 extern __inline
-__attribute__((__gnu_inline__))  // expected-warning{{'gnu_inline' attribute is overridden by 'extern inline', attribute ignored}} expected-warning{{extension used}}
+__attribute__((__gnu_inline__))  // expected-warning{{extension used}}
 void gnu_inline1() {}
 
 void