This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [libobjc]: Allow SjLj for x64 windows target
- From: Andrew Pinski <pinskia at gmail dot com>
- To: Kai Tietz <ktietz70 at googlemail dot com>
- Cc: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 3 Jul 2013 10:37:54 -0700
- Subject: Re: [libobjc]: Allow SjLj for x64 windows target
- References: <CAEwic4Zr2QUVbzcnigqvWVcW86+of_5YQGbNiYgnezZe88uo9A at mail dot gmail dot com>
On Wed, Jul 3, 2013 at 8:11 AM, Kai Tietz <ktietz70@googlemail.com> wrote:
> Hi,
>
> this patch fixes Obj-C's exception handling code for SEH x64. For it
> the guard for forcing SjLj was missing and therefore leads to issues,
> if OP wants to force SjLj.
>
> ChangeLog
>
> 2013-07-03 Kai Tietz <ktietz@redhat.com>
>
> * exception.c: Add check for SjLj to SEH blocks.
>
> Tested for x86_64-w64-mingw32, and i686-pc-cygwin. I will apply patch
> tomorrow, if there are no objections.
This is ok.
Thanks,
Andrew
>
> Regards,
> Kai
>
> Index: exception.c
> ===================================================================
> --- exception.c (Revision 200643)
> +++ exception.c (Arbeitskopie)
> @@ -202,7 +202,7 @@ get_ttype_entry (struct lsda_header_info *info, _U
> #ifdef SJLJ_EXCEPTIONS
> #define PERSONALITY_FUNCTION __gnu_objc_personality_sj0
> #define __builtin_eh_return_data_regno(x) x
> -#elif defined(__SEH__)
> +#elif defined(__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
> #define PERSONALITY_FUNCTION __gnu_objc_personality_imp
> #else
> #define PERSONALITY_FUNCTION __gnu_objc_personality_v0
> @@ -227,7 +227,7 @@ PERSONALITY_FUNCTION (_Unwind_State state,
>
> #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND
>
> -#ifdef __SEH__
> +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
> static
> #endif
> _Unwind_Reason_Code
> @@ -524,7 +524,7 @@ objc_exception_throw (id exception)
> abort ();
> }
>
> -#ifdef __SEH__
> +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__)
> EXCEPTION_DISPOSITION
> __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame,
> PCONTEXT ms_orig_context,
> @@ -533,4 +533,4 @@ __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_
> return _GCC_specific_handler (ms_exc, this_frame, ms_orig_context,
> ms_disp, __gnu_objc_personality_imp);
> }
> -#endif /* SEH */
> +#endif