Author: hans Date: Tue Aug 7 23:37:32 2018 New Revision: 339220 URL: http://llvm.org/viewvc/llvm-project?rev=339220&view=rev Log: Merging r339170: ------------------------------------------------------------------------ r339170 | mstorsjo | 2018-08-07 22:02:40 +0200 (Tue, 07 Aug 2018) | 5 lines
[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/branches/release_70/ (props changed) cfe/branches/release_70/lib/Headers/unwind.h Propchange: cfe/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 7 23:37:32 2018 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:338552-338553,338602,338627,338749,338942 +/cfe/trunk:338552-338553,338602,338627,338749,338942,339170 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_70/lib/Headers/unwind.h URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/lib/Headers/unwind.h?rev=339220&r1=339219&r2=339220&view=diff ============================================================================== --- cfe/branches/release_70/lib/Headers/unwind.h (original) +++ cfe/branches/release_70/lib/Headers/unwind.h Tue Aug 7 23:37:32 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. */ _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
