diff options
author | Hans Wennborg <hans@hanshq.net> | 2017-11-29 23:44:11 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2017-11-29 23:44:11 +0000 |
commit | b8304a6aed5291b15ff9e22118bafb2d8c2de794 (patch) | |
tree | 28a2455450abbfdcff165e91746b144a48ded2f7 /clang/lib | |
parent | e10568364e880ecb54111aba41b653bdf6b59609 (diff) | |
download | bcm5719-llvm-b8304a6aed5291b15ff9e22118bafb2d8c2de794.tar.gz bcm5719-llvm-b8304a6aed5291b15ff9e22118bafb2d8c2de794.zip |
MS ABI: Treat explicit instantiation definitions of dllimport function templates as explicit instantiation decls (PR35435)
This matches MSVC's behaviour, and we already do it for class templates
since r270897.
Differential revision: https://reviews.llvm.org/D40621
llvm-svn: 319386
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 26b80f11fb4..e110a8cc814 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -9239,10 +9239,18 @@ DeclResult Sema::ActOnExplicitInstantiation(Scope *S, return (Decl*) nullptr; } - Specialization->setTemplateSpecializationKind(TSK, D.getIdentifierLoc()); if (Attr) ProcessDeclAttributeList(S, Specialization, Attr); + // In MSVC mode, dllimported explicit instantiation definitions are treated as + // instantiation declarations. + if (TSK == TSK_ExplicitInstantiationDefinition && + Specialization->hasAttr<DLLImportAttr>() && + Context.getTargetInfo().getCXXABI().isMicrosoft()) + TSK = TSK_ExplicitInstantiationDeclaration; + + Specialization->setTemplateSpecializationKind(TSK, D.getIdentifierLoc()); + if (Specialization->isDefined()) { // Let the ASTConsumer know that this function has been explicitly // instantiated now, and its linkage might have changed. |