r339170 - [Headers] Expand _Unwind_Exception for SEH on MinGW/x86_64

Hans Wennborg via cfe-commits cfe-commits at lists.llvm.org
Tue Aug 7 23:38:35 PDT 2018


Merged to 7.0 in r339220.

On Tue, Aug 7, 2018 at 10:02 PM, Martin Storsjo via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
> Author: mstorsjo
> Date: Tue Aug  7 13:02:40 2018
> New Revision: 339170
>
> URL: http://llvm.org/viewvc/llvm-project?rev=339170&view=rev
> Log:
> [Headers] Expand _Unwind_Exception for SEH on MinGW/x86_64
>
> This matches how GCC defines this struct.
>
> Differential Revision: https://reviews.llvm.org/D50380
>
> Modified:
>     cfe/trunk/lib/Headers/unwind.h
>
> Modified: cfe/trunk/lib/Headers/unwind.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/unwind.h?rev=339170&r1=339169&r2=339170&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Headers/unwind.h (original)
> +++ cfe/trunk/lib/Headers/unwind.h Tue Aug  7 13:02:40 2018
> @@ -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. */
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


More information about the cfe-commits mailing list