ba60e4754a
2004-06-29 Andrew Haley <aph@redhat.com>
* except.c (expand_start_java_handler): Push a new binding level.
Don't build a TRY_CATCH_EXPR now, we'll do it later. Call
register_exception_range() to register where we'll do it.
(expand_end_java_handler): Remove old bogus code. Replace with
new logic that simply builds TRY_CATCH_EXPRs and inserts them at
the top of the expression we're curently building.
(maybe_end_try): Delete.
* decl.c (binding_level.exception_range): New field.
(clear_binding_level): Add field exception_range. Reformat.
(poplevel): Call expand_end_java_handler().
(poplevel): Call java_add_stmt only if functionbody is false.
(maybe_poplevels): Don't call maybe_end_try() from here.
(end_java_method): Clear no longer used trees in function decl.
(register_exception_range): New function.
* java-tree.h (register_exception_range, struct eh_range): Declare.
From-SVN: r83857
72 lines
2.5 KiB
C
72 lines
2.5 KiB
C
/* Definitions for exception handling for use by the GNU compiler
|
|
for the Java(TM) language compiler.
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA.
|
|
|
|
Java and all Java-based marks are trademarks or registered trademarks
|
|
of Sun Microsystems, Inc. in the United States and other countries.
|
|
The Free Software Foundation is independent of Sun Microsystems, Inc. */
|
|
|
|
struct eh_range
|
|
{
|
|
/* The (byte-code PC) range of the handled block. */
|
|
int start_pc;
|
|
int end_pc;
|
|
|
|
/* A list of handlers. For each element in the list,
|
|
the TREE_PURPOSE is the handled class (NULL_EXPR for a finally block),
|
|
and the TREE_VALUE is the LABEL_DECL of the handler. */
|
|
tree handlers;
|
|
|
|
/* Surrounding handler, if any. */
|
|
struct eh_range *outer;
|
|
|
|
/* The first child range. It is is nested inside this range
|
|
(i.e. this.start_pc <= first_child.end_pc
|
|
&& this.end_pc >= first_child.end_pc).
|
|
The children are linked together using next_sibling, and are sorted
|
|
by increasing start_pc and end_pc (we do not support non-nested
|
|
overlapping ranges). */
|
|
struct eh_range *first_child;
|
|
|
|
/* The next child of outer, in address order. */
|
|
struct eh_range *next_sibling;
|
|
|
|
/* True if this range has already been expanded. */
|
|
int expanded;
|
|
|
|
/* The TRY_CATCH_EXPR for this EH range. */
|
|
tree stmt;
|
|
};
|
|
|
|
/* A dummy range that represents the entire method. */
|
|
extern struct eh_range whole_range;
|
|
|
|
#define NULL_EH_RANGE (&whole_range)
|
|
|
|
extern struct eh_range * find_handler (int);
|
|
extern void method_init_exceptions (void);
|
|
extern void emit_handlers (void);
|
|
extern void maybe_start_try (int, int);
|
|
extern void maybe_end_try (int, int);
|
|
extern void add_handler (int, int, tree, tree);
|
|
extern void handle_nested_ranges (void);
|
|
extern void expand_resume_after_catch (void);
|
|
extern void expand_end_java_handler (struct eh_range *);
|