From: Shoaib Meenai Date: Wed, 9 Nov 2016 23:52:20 +0000 (+0000) Subject: [Sema] Use MS ABI behavior for dllexport in Itanium X-Git-Tag: llvmorg-4.0.0-rc1~5074 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab3f96cb21ed0bb5697bb5f92f3630d89e1e97de;p=platform%2Fupstream%2Fllvm.git [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 llvm-svn: 286419 --- diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index ce41a5e..e87fc73 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -7674,7 +7674,8 @@ Sema::ActOnExplicitInstantiation(Scope *S, 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. diff --git a/clang/test/CodeGenCXX/windows-itanium-dllexport.cpp b/clang/test/CodeGenCXX/windows-itanium-dllexport.cpp index 934c6a2..2b9b783 100644 --- a/clang/test/CodeGenCXX/windows-itanium-dllexport.cpp +++ b/clang/test/CodeGenCXX/windows-itanium-dllexport.cpp @@ -7,3 +7,19 @@ struct __declspec(dllexport) s { // CHECK: define {{.*}} dllexport {{.*}} @_ZN1saSERKS_ // CHECK: define {{.*}} dllexport {{.*}} @_ZN1s1fEv +template +class c { + void f() {} +}; + +template class __declspec(dllexport) c; + +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIiEaSERKS0_ +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIiE1fEv + +extern template class c; +template class __declspec(dllexport) c; + +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIcEaSERKS0_ +// CHECK: define {{.*}} dllexport {{.*}} @_ZN1cIcE1fEv +