Author: smeenai Date: Wed Nov 9 17:52:20 2016 New Revision: 286419 URL: http://llvm.org/viewvc/llvm-project?rev=286419&view=rev Log: [Sema] Use MS ABI behavior for dllexport in Itanium
Similar to r284288, make the Itanium ABI follow MS ABI dllexport semantics in the case of an explicit instantiation declaration followed by a dllexport explicit instantiation definition. Differential Revision: https://reviews.llvm.org/D26471 Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp cfe/trunk/test/CodeGenCXX/windows-itanium-dllexport.cpp Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=286419&r1=286418&r2=286419&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaTemplate.cpp (original) +++ cfe/trunk/lib/Sema/SemaTemplate.cpp Wed Nov 9 17:52:20 2016 @@ -7674,7 +7674,8 @@ Sema::ActOnExplicitInstantiation(Scope * Def->setTemplateSpecializationKind(TSK); if (!getDLLAttr(Def) && getDLLAttr(Specialization) && - Context.getTargetInfo().getCXXABI().isMicrosoft()) { + (Context.getTargetInfo().getCXXABI().isMicrosoft() || + Context.getTargetInfo().getTriple().isWindowsItaniumEnvironment())) { // In the MS ABI, an explicit instantiation definition can add a dll // attribute to a template with a previous instantiation declaration. // MinGW doesn't allow this. Modified: cfe/trunk/test/CodeGenCXX/windows-itanium-dllexport.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/windows-itanium-dllexport.cpp?rev=286419&r1=286418&r2=286419&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/windows-itanium-dllexport.cpp (original) +++ cfe/trunk/test/CodeGenCXX/windows-itanium-dllexport.cpp Wed Nov 9 17:52:20 2016 @@ -7,3 +7,19 @@ struct __declspec(dllexport) s { // CHECK: define {{.*}} dllexport {{.*}} @_ZN1saSERKS_ // CHECK: define {{.*}} dllexport {{.*}} @_ZN1s1fEv +template <class T> +class c { + void f() {} +}; + +template class __declspec(dllexport) c<int>; + +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIiEaSERKS0_ +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIiE1fEv + +extern template class c<char>; +template class __declspec(dllexport) c<char>; + +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIcEaSERKS0_ +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIcE1fEv + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
