diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-02 15:23:55 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-02 15:23:55 +0000 |
| commit | a217eb614007708e37e64dde0e08c53672cb4ce8 (patch) | |
| tree | a62894572a4c16deff12aa8a4292fec0e424af08 /gcc/objc | |
| parent | 61087bee65377ecf20720addf51ff00fbefded1b (diff) | |
| download | gcc-a217eb614007708e37e64dde0e08c53672cb4ce8.tar.gz | |
2009-04-02 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r145451
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@145454 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 12 |
2 files changed, 25 insertions, 2 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 66ac679f278..4e26aad210f 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,18 @@ +2009-03-30 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR bootstrap/39583 + * objc-act.c (in_late_binary_op): Define for Objective-C++. + +2009-03-29 Joseph Myers <joseph@codesourcery.com> + + PR c/456 + PR c/5675 + PR c/19976 + PR c/29116 + PR c/31871 + PR c/35198 + * objc-act.c (objc_finish_try_stmt): Set in_late_binary_op. + 2008-12-05 Sebastian Pop <sebastian.pop@amd.com> PR bootstrap/38262 diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index c23fb9ecba2..81d63b24dab 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -1,6 +1,6 @@ /* Implement classes and message passing for Objective C. - Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Steve Naroff. This file is part of GCC. @@ -79,6 +79,11 @@ along with GCC; see the file COPYING3. If not see static unsigned int should_call_super_dealloc = 0; +/* When building Objective-C++, we need in_late_binary_op. */ +#ifdef OBJCPLUS +bool in_late_binary_op = false; +#endif /* OBJCPLUS */ + /* When building Objective-C++, we are not linking against the C front-end and so need to replicate the C tree-construction functions in some way. */ #ifdef OBJCPLUS @@ -3885,12 +3890,15 @@ objc_finish_try_stmt (void) /* If we're doing Darwin setjmp exceptions, build the big nasty. */ if (flag_objc_sjlj_exceptions) { + bool save = in_late_binary_op; + in_late_binary_op = true; if (!cur_try_context->finally_body) { cur_try_context->finally_locus = input_location; cur_try_context->end_finally_locus = input_location; } stmt = next_sjlj_build_try_catch_finally (); + in_late_binary_op = save; } else { |