commit 7f26fa67154187401a70efc06e140e7f090e5c3b
author Hans Wennborg <hans@hanshq.net> Mon May 19 20:14:13 2014 +0000
committer Hans Wennborg <hans@hanshq.net> Mon May 19 20:14:13 2014 +0000
tree 6c33c911c7c0b1c178cfc182d560a1547c2a7ec1
parent dc9210276637bf67091ff8885f0c2c0e08fadbcb

Allow dllimport on function definitions when they're template instantiations

llvm-svn: 209157

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 5276caf..44ca495 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9766,7 +9766,8 @@
     ResolveExceptionSpec(D->getLocation(), FPT);
 
   // dllimport cannot be applied to non-inline function definitions.
-  if (FD->hasAttr<DLLImportAttr>() && !FD->isInlined()) {
+  if (FD->hasAttr<DLLImportAttr>() && !FD->isInlined() &&
+      !FD->isTemplateInstantiation()) {
     assert(!FD->hasAttr<DLLExportAttr>());
     Diag(FD->getLocation(), diag::err_attribute_dllimport_function_definition);
     FD->setInvalidDecl();

clang/test/CodeGenCXX/dllimport.cpp

diff --git a/clang/test/CodeGenCXX/dllimport.cpp b/clang/test/CodeGenCXX/dllimport.cpp
index d8e58f7..c4640c1 100644
--- a/clang/test/CodeGenCXX/dllimport.cpp
+++ b/clang/test/CodeGenCXX/dllimport.cpp
@@ -8,7 +8,7 @@
 inline void DLLIMPORT b() {}
 // CHECK-DAG: define available_externally dllimport void @"\01?b@@YAXXZ"()
 
-template <typename T> inline void c() {} // FIXME: MSVC accepts this without 'inline' too.
+template <typename T> void c() {}
 template void DLLIMPORT c<int>();
 // CHECK-DAG: define available_externally dllimport void @"\01??$c@H@@YAXXZ"()