OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libobjc/22492 ([PATCH] Abort after @finally: libobjc passing exception value instead of exception.)

Browse Source 
libobjc/ChangeLog:

2005-08-13  Marcin Koziej  <creep@desk.pl>
            Andrew Pinski  <pinskia@physics.uc.edu>

	PR libobjc/22492
	* exception.c (PERSONALITY_FUNCTION): Fix the PC with finally.

testsuite/ChangeLog:
2005-08-13  Marcin Koziej  <creep@desk.pl>
            Andrew Pinski  <pinskia@physics.uc.edu>

	PR libobjc/22492
	* execute/exceptions/finally-1.m: New test.

Co-Authored-By: Andrew Pinski <pinskia@physics.uc.edu>

From-SVN: r103073
This commit is contained in:
Marcin Koziej 2005-08-14 04:01:52 +02:00 committed by Andrew Pinski
parent 65045c0903
commit ee1658f343
4 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2005-08-13 Marcin Koziej <creep@desk.pl>
Andrew Pinski <pinskia@physics.uc.edu>
PR libobjc/22492
* execute/exceptions/finally-1.m: New test.
2005-08-13 Andrew Pinski <pinskia@physics.uc.edu>
* objc.dg/nested-func-1.m: Move to ...

45
gcc/testsuite/objc/execute/exceptions/finally-1.m Normal file
View File

@ -0,0 +1,45 @@
#include <objc/Object.h>
int
thrower_try_body()
{
printf("Thrower try body\n");
return (0);
}
int
finally_body()
{
printf("Finally body\n");
return (0);
}
int
thrower()
{
@try
{
thrower_try_body();
@throw [Object new];
}
@finally
{
finally_body();
} // <----- program aborts here.
return 0;
}
int
main(int ac, char *av[])
{
@try
{
thrower();
}
@catch (id exc)
{
printf("Got exception of class %s\n", [[exc class] name]);
[exc free];
}
}

6
libobjc/ChangeLog
View File

@ -1,3 +1,9 @@
2005-08-13 Marcin Koziej <creep@desk.pl>
Andrew Pinski <pinskia@physics.uc.edu>
PR libobjc/22492
* exception.c (PERSONALITY_FUNCTION): Fix the PC with finally.
2005-08-13 Andrew Pinski <pinskia@physics.uc.edu>
* Makefile.in (extra_ldflags_libobjc): New.

12
libobjc/exception.c
View File

@ -165,7 +165,8 @@ PERSONALITY_FUNCTION (int version,
const unsigned char *p;
_Unwind_Ptr landing_pad, ip;
int handler_switch_value;
int saw_cleanup, saw_handler;
int saw_cleanup = 0, saw_handler;
void *return_object;
/* Interface version check. */
if (version != 1)
@ -334,8 +335,15 @@ PERSONALITY_FUNCTION (int version,
}
install_context:
if (saw_cleanup == 0)
{
return_object = xh->value;
if (!(actions & _UA_SEARCH_PHASE))
_Unwind_DeleteException(&xh->base);
}
_Unwind_SetGR (context, __builtin_eh_return_data_regno (0),
__builtin_extend_pointer (xh->value));
__builtin_extend_pointer (saw_cleanup ? xh : return_object));
_Unwind_SetGR (context, __builtin_eh_return_data_regno (1),
handler_switch_value);
_Unwind_SetIP (context, landing_pad);