r315111 - Revert "For dllexport class templates, export specializations of member functions (PR34849)"

[Reid Kleckner via cfe-commits]

Author: rnk
Date: Fri Oct  6 14:28:21 2017
New Revision: 315111

URL: http://llvm.org/viewvc/llvm-project?rev=315111&view=rev
Log:
Revert "For dllexport class templates, export specializations of member functions (PR34849)"

This reverts r315025, it caused http://crbug.com/772461

Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp
    cfe/trunk/test/CodeGenCXX/dllexport.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=315111&r1=315110&r2=315111&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Oct  6 14:28:21 2017
@@ -6041,21 +6041,6 @@ static void checkDLLAttributeRedeclarati
            diag::warn_dllimport_dropped_from_inline_function)
         << NewDecl << OldImportAttr;
   }
-
-  // A specialization of a class template member function is processed here
-  // since it's a redeclaration. If the parent class is dllexport, the
-  // specialization inherits that attribute. This doesn't happen automatically
-  // since the parent class isn't instantiated until later.
-  if (IsSpecialization && isa<CXXMethodDecl>(NewDecl) && !NewImportAttr &&
-      !NewExportAttr) {
-    if (const DLLExportAttr *ParentExportAttr = cast<CXXMethodDecl>(NewDecl)
-                                             ->getParent()
-                                             ->getAttr<DLLExportAttr>()) {
-      DLLExportAttr *NewAttr = ParentExportAttr->clone(S.Context);
-      NewAttr->setInherited(true);
-      NewDecl->addAttr(NewAttr);
-    }
-  }
 }
 
 /// Given that we are within the definition of the given function,

Modified: cfe/trunk/test/CodeGenCXX/dllexport.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dllexport.cpp?rev=315111&r1=315110&r2=315111&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/dllexport.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/dllexport.cpp Fri Oct  6 14:28:21 2017
@@ -831,14 +831,6 @@ template <typename T> struct ExplicitIns
 template struct __declspec(dllexport) __declspec(dllimport) ExplicitInstantiationTwoAttributes<int>;
 // M32-DAG: define weak_odr dllexport x86_thiscallcc void @"\01?f@?$ExplicitInstantiationTwoAttributes at H@@QAEXXZ"
 
-// Specializations of exported class template functions get exported.
-namespace pr34849 {
-template <typename T> struct __declspec(dllexport) ExportedClass { void foo(); };
-template<> void ExportedClass<int>::foo() {}
-template struct ExportedClass<int>;
-// M32-DAG: define dllexport x86_thiscallcc void @"\01?foo@?$ExportedClass at H@pr34849@@QAEXXZ"
-}
-
 
 //===----------------------------------------------------------------------===//
 // Classes with template base classes