OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

The dllimport.cpp test was gating some checks on #ifndef MSABI, 

but MSABI was never defined in the test. It seems we are erroring
on code that we should be accepting when compiling for MSVC compatibility.

This should make the test less confusing until PR21406 is fixed.

llvm-svn: 220825
This commit is contained in:
Hans Wennborg 2014-10-28 22:15:55 +00:00
parent e0afce767a
commit 349847d02a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/test/SemaCXX/dllimport.cpp
View File

@ -684,15 +684,17 @@ template void MemFunTmpl::importedStatic<ExplicitInst_Imported>();
template<> __declspec(dllimport) void MemFunTmpl::importedNormal<ExplicitSpec_Imported>();
template<> __declspec(dllimport) void MemFunTmpl::importedNormal<ExplicitSpec_Def_Imported>() {} // error on mingw
template<> __declspec(dllimport) inline void MemFunTmpl::importedNormal<ExplicitSpec_InlineDef_Imported>() {}
#ifndef MSABI
// expected-error@-3{{dllimport cannot be applied to non-inline function definition}}
#if 1
// FIXME: This should not be an error when targeting MSVC. (PR21406)
// expected-error@-4{{dllimport cannot be applied to non-inline function definition}}
#endif
template<> __declspec(dllimport) void MemFunTmpl::importedStatic<ExplicitSpec_Imported>();
template<> __declspec(dllimport) void MemFunTmpl::importedStatic<ExplicitSpec_Def_Imported>() {} // error on mingw
template<> __declspec(dllimport) inline void MemFunTmpl::importedStatic<ExplicitSpec_InlineDef_Imported>() {}
#ifndef MSABI
// expected-error@-3{{dllimport cannot be applied to non-inline function definition}}
#if 1
// FIXME: This should not be an error when targeting MSVC. (PR21406)
// expected-error@-4{{dllimport cannot be applied to non-inline function definition}}
#endif
// Not importing specialization of an imported member function template without
@ -715,15 +717,17 @@ template __declspec(dllimport) void MemFunTmpl::staticDef<ExplicitInst_Imported>
template<> __declspec(dllimport) void MemFunTmpl::normalDef<ExplicitSpec_Imported>();
template<> __declspec(dllimport) void MemFunTmpl::normalDef<ExplicitSpec_Def_Imported>() {} // error on mingw
template<> __declspec(dllimport) inline void MemFunTmpl::normalDef<ExplicitSpec_InlineDef_Imported>() {}
#ifndef MSABI
// expected-error@-3{{dllimport cannot be applied to non-inline function definition}}
#if 1
// FIXME: This should not be an error when targeting MSVC. (PR21406)
// expected-error@-4{{dllimport cannot be applied to non-inline function definition}}
#endif
template<> __declspec(dllimport) void MemFunTmpl::staticDef<ExplicitSpec_Imported>();
template<> __declspec(dllimport) void MemFunTmpl::staticDef<ExplicitSpec_Def_Imported>() {} // error on mingw
template<> __declspec(dllimport) inline void MemFunTmpl::staticDef<ExplicitSpec_InlineDef_Imported>() {}
#ifndef MSABI
// expected-error@-3{{dllimport cannot be applied to non-inline function definition}}
#if 1
// FIXME: This should not be an error when targeting MSVC. (PR21406)
// expected-error@-4{{dllimport cannot be applied to non-inline function definition}}
#endif