Author: hans
Date: Tue Oct 28 17:15:55 2014
New Revision: 220825
URL: http://llvm.org/viewvc/llvm-project?rev=220825&view=rev
Log:
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.
Modified:
cfe/trunk/test/SemaCXX/dllimport.cpp
Modified: cfe/trunk/test/SemaCXX/dllimport.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/dllimport.cpp?rev=220825&r1=220824&r2=220825&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/dllimport.cpp (original)
+++ cfe/trunk/test/SemaCXX/dllimport.cpp Tue Oct 28 17:15:55 2014
@@ -684,15 +684,17 @@ template void MemFunTmpl::importedStatic
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 MemF
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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
