2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 706a97354e4..2c966150df2 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -241,6 +241,14 @@ void CodeGenModule::EmitAnnotations() {
 
 static CodeGenModule::GVALinkage
 GetLinkageForFunction(const FunctionDecl *FD, const LangOptions &Features) {
+  if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(FD)) {
+    // C++ member functions defined inside the class are always inline.
+    if (MD->isInline() || !MD->isOutOfLineDefinition())
+      return CodeGenModule::GVA_CXXInline;
+    
+    return CodeGenModule::GVA_StrongExternal;
+  }
+  
   // "static" functions get internal linkage.
   if (FD->getStorageClass() == FunctionDecl::Static)
     return CodeGenModule::GVA_Internal;
diff --git a/clang/test/CodeGenCXX/member-functions.cpp b/clang/test/CodeGenCXX/member-functions.cpp
index 84a18811d06..02c7e2c36d5 100644
--- a/clang/test/CodeGenCXX/member-functions.cpp
+++ b/clang/test/CodeGenCXX/member-functions.cpp
@@ -26,14 +26,21 @@ struct S {
   inline ~S() { }
   
   
+  // RUN: grep "define linkonce_odr void @_ZN1S9f_inline1Ev" %t &&
   void f_inline1() { }
   // RUN: grep "define linkonce_odr void @_ZN1S9f_inline2Ev" %t &&
   inline void f_inline2() { }
   
-  // RUN: grep "define internal void @_ZN1S1gEv" %t
+  // RUN: grep "define linkonce_odr void @_ZN1S1gEv" %t &&
   static void g() { }
+  
+  static void f();
 };
 
+// RUN: grep "define void @_ZN1S1fEv" %t
+void S::f() {
+}
+
 void test2() {
   S s;