[libcxxabi] Use the right calling convention for exception destructors on i386 Windows
On Windows on i386, C++ member functions use a different calling
convention (`__thiscall`) than the default one for regular functions
(`__cdecl`). (On Windows on architectures other than i386, both calling
convention attributes are no-ops.)
This matches how libstdc++ declares these types.
This fixes the std/thread/futures/futures.{shared,unique}_future/dtor.pass.cpp
tests on i386 mingw.
Differential Revision: https://reviews.llvm.org/D124990
GitOrigin-RevId: aeb4907ed658ad5538f8cd569facae5beaab2940
diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h
index 7bc39ad..11a74db 100644
--- a/include/__cxxabi_config.h
+++ b/include/__cxxabi_config.h
@@ -97,4 +97,10 @@
# define _LIBCXXABI_NO_EXCEPTIONS
#endif
+#if defined(_WIN32)
+#define _LIBCXXABI_DTOR_FUNC __thiscall
+#else
+#define _LIBCXXABI_DTOR_FUNC
+#endif
+
#endif // ____CXXABI_CONFIG_H
diff --git a/include/cxxabi.h b/include/cxxabi.h
index 770a8cb..85cb4b3 100644
--- a/include/cxxabi.h
+++ b/include/cxxabi.h
@@ -47,7 +47,7 @@
// 2.4.3 Throwing the Exception Object
extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void
__cxa_throw(void *thrown_exception, std::type_info *tinfo,
- void (*dest)(void *));
+ void (_LIBCXXABI_DTOR_FUNC *dest)(void *));
// 2.5.3 Exception Handlers
extern _LIBCXXABI_FUNC_VIS void *
diff --git a/src/cxa_exception.cpp b/src/cxa_exception.cpp
index 059d75c..b17c79e 100644
--- a/src/cxa_exception.cpp
+++ b/src/cxa_exception.cpp
@@ -254,7 +254,7 @@
exception.
*/
void
-__cxa_throw(void *thrown_object, std::type_info *tinfo, void (*dest)(void *)) {
+__cxa_throw(void *thrown_object, std::type_info *tinfo, void (_LIBCXXABI_DTOR_FUNC *dest)(void *)) {
__cxa_eh_globals *globals = __cxa_get_globals();
__cxa_exception* exception_header = cxa_exception_from_thrown_object(thrown_object);
diff --git a/src/cxa_exception.h b/src/cxa_exception.h
index 7a32fb6..64123d4 100644
--- a/src/cxa_exception.h
+++ b/src/cxa_exception.h
@@ -43,7 +43,7 @@
// Manage the exception object itself.
std::type_info *exceptionType;
- void (*exceptionDestructor)(void *);
+ void (_LIBCXXABI_DTOR_FUNC *exceptionDestructor)(void *);
std::unexpected_handler unexpectedHandler;
std::terminate_handler terminateHandler;
@@ -81,7 +81,7 @@
#endif
std::type_info *exceptionType;
- void (*exceptionDestructor)(void *);
+ void (_LIBCXXABI_DTOR_FUNC *exceptionDestructor)(void *);
std::unexpected_handler unexpectedHandler;
std::terminate_handler terminateHandler;