diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-10-28 22:15:55 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-10-28 22:15:55 +0000 |
| commit | 349847d02a00017225b34b35eeb9dceb730d08b8 (patch) | |
| tree | 50d3f528991e80726778a946793735b7252fdeea | |
| parent | e0afce767a500049184e294cb138a2f3fad0c3e0 (diff) | |
| download | bcm5719-llvm-349847d02a00017225b34b35eeb9dceb730d08b8.tar.gz bcm5719-llvm-349847d02a00017225b34b35eeb9dceb730d08b8.zip | |
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
| -rw-r--r-- | clang/test/SemaCXX/dllimport.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/clang/test/SemaCXX/dllimport.cpp b/clang/test/SemaCXX/dllimport.cpp index 1ba25dbbc5c..27378256f4f 100644 --- a/clang/test/SemaCXX/dllimport.cpp +++ b/clang/test/SemaCXX/dllimport.cpp @@ -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 |
