From: Martin Storsjo Date: Tue, 7 Aug 2018 20:02:40 +0000 (+0000) Subject: [Headers] Expand _Unwind_Exception for SEH on MinGW/x86_64 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=069ac442a1873542f1a6fa6e115da809607705aa;p=clang [Headers] Expand _Unwind_Exception for SEH on MinGW/x86_64 This matches how GCC defines this struct. Differential Revision: https://reviews.llvm.org/D50380 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339170 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h index 345fa4d0c1..0e8317e5b9 100644 --- a/lib/Headers/unwind.h +++ b/lib/Headers/unwind.h @@ -154,8 +154,12 @@ struct _Unwind_Control_Block { struct _Unwind_Exception { _Unwind_Exception_Class exception_class; _Unwind_Exception_Cleanup_Fn exception_cleanup; +#if !defined (__USING_SJLJ_EXCEPTIONS__) && defined (__SEH__) + _Unwind_Word private_[6]; +#else _Unwind_Word private_1; _Unwind_Word private_2; +#endif /* The Itanium ABI requires that _Unwind_Exception objects are "double-word * aligned". GCC has interpreted this to mean "use the maximum useful * alignment for the target"; so do we. */