2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> Zdenek Dvorak <dvorakz@suse.cz> Richard Guenther <rguenther@suse.de> Kaz Kojima <kkojima@gcc.gnu.org> * tree-vrp.c (compare_values_warnv): Convert val2 to the type of val1. (extract_range_from_assert): Create POINTER_PLUS_EXPR for pointer types. (extract_range_from_binary_expr): Handle only POINTER_PLUS_EXPR, MIN_EXPR, and MAX_EXPR for pointer types. * doc/c-tree.texi (POINTER_PLUS_EXPR): Document. * tree-ssa-loop-niter.c (split_to_var_and_offset): Handle POINTER_PLUS_EXPR as PLUS_EXPR. (number_of_iterations_lt_to_ne): For pointer types, use sizetype when creating MINUS_EXPR/PLUS_EXPRs. (assert_loop_rolls_lt): For pointer types, use sizetype when creating MINUS_EXPR/PLUS_EXPRs. (number_of_iterations_le): Likewise. (expand_simple_operations): POINTER_PLUS_EXPR are simple also. (derive_constant_upper_bound): Handle POINTER_PLUS_EXPR just like PLUS_EXPR and MINUS_EXPR. * tree-pretty-print.c (dump_generic_node): Handle POINTER_PLUS_EXPR. (op_prio): Likewise. (op_symbol_1): Likewise. * optabs.c (optab_for_tree_code): Likewise. * tree-ssa-loop-manip.c (create_iv): Handle pointer base specially. * tree-tailcall.c (process_assignment): Mention POINTER_PLUS_EXPR in a TODO comment. * tree.c (build2_stat): Assert when trying to use PLUS_EXPR or MINUS_EXPR with a pointer. Also assert for POINTER_PLUS_EXPR not used with a pointer and an integer type. * tree-scalar-evolution.c (add_to_evolution_1): Convert the increment using chrec_convert_rhs instead of chrec_convert. (follow_ssa_edge_in_rhs): Handle POINTER_PLUS_EXPR like PLUS_EXPR except for the right hand side's type will be sizetype. (interpret_rhs_modify_stmt): Handle POINTER_PLUS_EXPR. (fold_used_pointer_cast): Kill. (pointer_offset_p): Kill. (fold_used_pointer): Kill. (pointer_used_p): Kill. (analyze_scalar_evolution_1 <case GIMPLE_MODIFY_STMT>): Don't call fold_used_pointer. (instantiate_parameters_1): Convert the increment using chrec_convert_rhs instead of chrec_convert. Handle POINTER_PLUS_EXPR as PLUS_EXPR. * builtins.c (get_pointer_alignment): Handle POINTER_PLUS_EXPR instead of PLUS_EXPR. (expand_builtin_strcat): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. (std_gimplify_va_arg_expr): Likewise. (fold_builtin_memory_op): Likewise. (fold_builtin_strstr): Likewise. (fold_builtin_strchr): Likewise. (fold_builtin_strrchr): Likewise. (fold_builtin_strpbrk): Likewise. (expand_builtin_memory_chk): Likewise. (fold_builtin_memory_chk): Likewise. (std_expand_builtin_va_start): Use sizetype for the call to make_tree and then convert to the pointer type. (fold_builtin_memchr): Use POINTER_PLUS_EXPR instead of PLUS_EXPR for adding to a pointer. (std_gimplify_va_arg_expr): Use fold_build2 for the creating of POINTER_PLUS_EXPR. For the BIT_AND_EXPR, cast the operands to sizetype first and then cast the BIT_AND_EXPR back to the pointer type. * fold-const.c (build_range_check): Handle pointer types specially. (extract_array_ref): Look for POINTER_PLUS_EXPR instead of PLUS_EXPR's. Make sure the offset is converted to sizetype. (try_move_mult_to_index): Strip the NOPs from the offset. Remove code argument and replace all uses with PLUS_EXPR. (fold_to_nonsharp_ineq_using_bound): Handle pointer types specially. Don't use a pointer type for MINUS_EXPR. (fold_unary): Handle for (T1)(X op Y), only p+ as that is the only as that can be handled for binary operators now. (fold_binary <case POINTER_PLUS_EXPR>): Add folding of POINTER_PLUS_EXPR. <case PLUS_EXPR>: Add folding of PTR+INT into PTR p+ INT. Don't call try_move_mult_to_index. <case MINUS_EXPR>: Fold (PTR0 p+ A) - (PTR1 p+ B) into (PTR0 - PTR1) + (A - B). Fold (PTR0 p+ A) - PTR1 into (PTR0 - PTR1) + A iff (PTR0 - PTR1) simplifies. Don't call try_move_mult_to_index. (tree_expr_nonnegative_warnv_p): Handle POINTER_PLUS_EXPR. (tree_expr_nonzero_p): Likewise. (fold_indirect_ref_1): Look at POINTER_PLUS_EXPR instead of PLUS_EXPR for the complex expression folding. * tree-chrec.c (chrec_fold_plus_poly_poly): If the first chrec is a pointer type, then the second should be sizetype and not the first's type. For POINTER_PLUS_EXPR, use a different right hand side type. Handle POINTER_PLUS_EXPR like PLUS_EXPR. (chrec_fold_plus_1): For POINTER_PLUS_EXPR, use a different right hand side type. Handle POINTER_PLUS_EXPR like PLUS_EXPR. (chrec_fold_plus): For pointer types, use POINTER_PLUS_EXPR instead of PLUS_EXPR. When either operand is zero, convert the other operand. (chrec_apply): Use chrec_convert_rhs on the argument x instead of chrec_convert. (reset_evolution_in_loop): For pointer types, the new_evol should be sizetype. (convert_affine_scev): For POINTER_PLUS_EXPR, use a different right hand side type. Handle POINTER_PLUS_EXPR like PLUS_EXPR. (chrec_convert_rhs): New function. (chrec_convert_aggressive): For POINTER_PLUS_EXPR, use a different right hand side type. Handle POINTER_PLUS_EXPR like PLUS_EXPR. * tree-chrec.h (chrec_convert_rhs): New prototype. (build_polynomial_chrec): For pointer types, the right hand * tree-ssa-ccp.c (maybe_fold_stmt_indirect): Look for POINTER_PLUS_EXPR instead of PLUS_EXPR's. Remove subtraction case as it is always addition now. Make sure the offset is converted to sizetype. (fold_stmt_r): Don't handle PLUS_EXPR/MINUS_EXPR specially. Handle POINTER_PLUS_EXPR like PLUS_EXPR was handled before. * tree-ssa-loop-ivopts.c (determine_base_object): Abort for PLUS_EXPR in pointer type. Handle POINTER_PLUS_EXPR. (tree_to_aff_combination): Likewise. (force_expr_to_var_cost): Likewise. (force_expr_to_var_cost): Likewise. Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * c-format.c (check_format_arg): Handle POINTER_PLUS_EXPR instead of PLUS_EXPR of pointer types. * tree-stdarg.c (va_list_counter_bump): Handle POINTER_PLUS_EXPR as PLUS_EXPR. (check_va_list_escapes): Likewise. (check_all_va_list_escapes): Likewise. * dwarf2out.c (loc_descriptor_from_tree_1): Handle POINT_PLUS_EXPR as a PLUS_EXPR. * expr.c (expand_expr_real_1): Handle POINTER_PLUS_EXPR. (string_constant): Likewise. * tree-ssa-address.c (tree_mem_ref_addr): When adding the offset to the base, use POINTER_PLUS_EXPR. (add_to_parts): Convert the index to sizetype. (create_mem_ref): Create A POINTER_PLUS_EXPR for the one case. * matrix-reorg.c (collect_data_for_malloc_call): Stmt will now only be either INDIRECT_REF and POINTER_PLUS_EXPR. Offset only holds something for PLUS_EXPR. (ssa_accessed_in_tree): Handle POINTER_PLUS_EXPR just as a PLUS_EXPR. (analyze_transpose): POINTER_PLUS_EXPR will only show up now and not PLUS_EXPR. (analyze_accesses_for_modify_stmt): Likewise. Remove comment about the type being integral type as it is wrong now. (can_calculate_expr_before_stmt): Handle POINTER_PLUS_EXPR as PLUS_EXPR. (transform_access_sites): POINTER_PLUS_EXPR will only show up now and not PLUS_EXPR. Correct the type which the artimentic is done in (is now sizetype). Reindent one loop. * tree-data-ref.c (split_constant_offset): Handle POINTER_PLUS_EXPR * tree-affine.c (tree_to_aff_combination): Likewise. * c-typeck.c (build_unary_op): For pointers create the increment as a sizetype. Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * gimplify.c (gimplify_self_mod_expr): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. (gimplify_omp_atomic_fetch_op): Handle POINTER_PLUS_EXPR. * tree.def (POINTER_PLUS_EXPR): New tree code. * tree-predcom.c (ref_at_iteration): If we have a pointer type do the multiplication in sizetype. * tree-mudflap.c (mf_xform_derefs_1): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * tree-ssa-forwprop.c (forward_propagate_addr_into_variable_array_index): Don't expect there to be a cast for the index as that does not exist anymore. (forward_propagate_addr_expr_1): Check for POINTER_PLUS_EXPR instead of PLUS_EXPR. Don't check for the first operand of the POINTER_PLUS_EXPR was the index as it cannot be. Call forward_propagate_addr_into_variable_array_index with the SSA_NAME instead of the statement. * varasm.c (const_hash_1): Handle POINTER_PLUS_EXPR. (compare_constant): Likewise. (copy_constant): Likewise. (compute_reloc_for_constant): Likewise. (output_addressed_constants): Likewise. (initializer_constant_valid_p): Likewise. * tree-ssa.c (tree_ssa_useless_type_conversion_1): Convert the MIN/MAX of the inner type to the outer type before comparing them. * tree-ssa-loop-prefetch.c (idx_analyze_ref): Handle POINTER_PLUS_EXPR instead of PLUS_EXPR. (issue_prefetch_ref): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * tree-inline.c (estimate_num_insns_1): Handle POINTER_PLUS_EXPR. * tree-vect-transform.c (vect_create_addr_base_for_vector_ref): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. (bump_vector_ptr): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for the pointer increment statement. (vect_update_ivs_after_vectorizer): For pointer types, create POINTER_PLUS_EXPR instead of PLUS_EXPR and also create MULT_EXPR in sizetype. (vect_gen_niters_for_prolog_loop): Add a cast when creating byte_misalign. * tree-object-size.c (plus_expr_object_size): Handle POINTER_PLUS_EXPR instead of PLUS_EXPR. Removing all the extra code which is trying to figure out which side is a pointer and is the index. (check_for_plus_in_loops_1): Likewise. (check_for_plus_in_loops): Likewise. * c-common.c (pointer_int_sum): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * tree-ssa-structalias.c (handle_ptr_arith): Handle only POINTER_PLUS_EXPR. Removing all the extra code which is trying to figure out which side is a pointer and is the index. * tree-cfg.c (verify_expr): Add extra checking for pointers and PLUS_EXPR and MINUS_EXPR. Also add checking to make sure the operands of POINTER_PLUS_EXPR are correct. * config/frv/frv.c (frv_expand_builtin_va_start): Use sizetype with make_tree, instead of a pointer type. * config/s390/s390.c (s390_va_start): Use POINTER_PLUS_EXPR for pointers instead of PLUS_EXPR. (s390_gimplify_va_arg): Likewise. * config/spu/spu.c (spu_va_start): Create POINTER_PLUS_EXPR instead of PLUS_EXPR when doing addition on pointer types. Use sizetype for the second operand. (spu_gimplify_va_arg_expr): Likewise. * config/sparc/sparc.c (sparc_gimplify_va_arg): Use POINTER_PLUS_EXPR instead of PLUS_EXPR when the operand was a pointer. Don't create a BIT_AND_EXPR for pointer types. * config/i386/i386.c (ix86_va_start): Use POINTER_PLUS_EXPR for the pointer addition and also use size_int/sizetype for the offset. (ix86_gimplify_va_arg): Likewise. Perform BIT_AND_EXPR on sizetype arguments. * config/sh/sh.c (sh_va_start): Call make_tree with sizetype and convert its result to a pointer type. Use POINTER_PLUS_EXPR for the pointer additions and also use size_int for the offsets. (sh_gimplify_va_arg_expr): Use POINTER_PLUS_EXPR for the pointer additions and also use size_int for the offsets. Perform BIT_AND_EXPR on sizetype arguments. * config/ia64/ia64.c (ia64_gimplify_va_arg): Use POINTER_PLUS_EXPR for pointers and create the BIT_AND_EXPR in sizetype. * config/rs6000/rs6000.c (rs6000_va_start): Use POINTER_PLUS_EXPR instead of PLUS_EXPR for pointer addition. (rs6000_va_start): Likewise. Also use sizetype for the offset. * config/pa/pa.c (reloc_needed): Handle POINTER_PLUS_EXPR as PLUS_EXPR/MINUS_EXPR. (hppa_gimplify_va_arg_expr): Don't create MINUS_EXPR or PLUS_EXPR for pointers, instead use POINTER_PLUS_EXPR. Don't use BIT_AND_EXPR on a pointer type, convert the expression to sizetype first. * config/mips/mips.c (mips_va_start): Use POINTER_PLUS_EXPR for pointers. (mips_gimplify_va_arg_expr): Likewise. Don't create BIT_AND_EXPR in a pointer type. 2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> * trans-intrinsic.c (gfc_conv_intrinsic_repeat): Use POINTER_PLUS_EXPR instead of PLUS_EXPR for pointer addition. * trans-expr.c (gfc_trans_string_copy): Create POINTER_PLUS_EXPR instead of a PLUS_EXPR for pointer types. 2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> * typeck.c (build_binary_op): For templates build the expression in pieces to avoid the assert in build2_stat. (get_member_function_from_ptrfunc): Change over to using POINTER_PLUS_EXPR and convert the second operand to sizetype. * typeck2.c (build_m_component_ref): Likewise. * init.c (expand_virtual_init): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. (build_new_1): Likewise. (build_vec_delete_1): Likewise. (build_vec_delete): Likewise. * class.c (build_base_path): Likewise. (build_base_path): Likewise. (convert_to_base_statically): Likewise. (fixed_type_or_null): Handle POINTER_PLUS_EXPR. (get_vtbl_decl_for_binfo): Handle POINTER_PLUS_EXPR instead of PLUS_EXPR. (dfs_accumulate_vtbl_inits): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * call.c (build_special_member_call): Likewise. * rtti.c (build_headof): Likewise. Use sizetype instead of ptrdiff_type_node. (tinfo_base_init): Create a POINTER_PLUS_EXPR instead of PLUS_EXPR for pointers. * except.c (expand_start_catch_block): Do a NEGATIVE and then a POINTER_PLUS_EXPR instead of a MINUS_EXPR. * cp-gimplify.c (cxx_omp_clause_apply_fn): Convert PLUS_EXPR on pointer types over to use POINTER_PLUS_EXPR and remove the conversion to the pointer types. * method.c (thunk_adjust): Use POINTER_PLUS_EXPR for adding to a pointer type. Use size_int instead of ssize_int. Convert the index to sizetype before adding it to the pointer. 2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> * trans.c (Attribute_to_gnu): When subtracting an offset from a pointer, use POINTER_PLUS_EXPR with NEGATE_EXPR instead of MINUS_EXPR. (gnat_to_gnu): Likewise. * utils.c (convert): When converting between thin pointers, use POINTER_PLUS_EXPR and sizetype for the offset. * utils2.c (known_alignment): POINTER_PLUS_EXPR have the same semantics as PLUS_EXPR for alignment. (build_binary_op): Add support for the semantics of POINTER_PLUS_EXPR's operands. When adding an offset to a pointer, use POINTER_PLUS_EXPR. 2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> * class.c (make_class_data): Build the index in sizetype. Use POINTER_PLUS_EXPR instead of PLUS_EXPR when adding to a pointer type. (build_symbol_entry): Likewise. * expr.c (build_java_arrayaccess): Likewise. (build_field_ref): Likewise. (build_known_method_ref): Likewise. (build_invokevirtual): Likewise. * except.c (build_exception_object_ref): Do a NEGATIVE and then a POINTER_PLUS_EXPR instead of a MINUS_EXPR. 2007-06-15 Andrew Pinski <andrew_pinski@playstation.sony.com> PR tree-opt/32225 * gcc.c-torture/compile/20070605-1.c: New test. * gcc.c-torture/compile/20070603-1.c: New testcase. * gcc.c-torture/compile/20070603-2.c: New testcase. * gcc.c-torture/compile/20070531-1.c: New test. PR tree-opt/32167 * gcc.c-torture/compile/20070531-2.c: New test. PR tree-opt/32144 * gcc.c-torture/compile/20070529-1.c: New test. PR tree-opt/32145 * gcc.c-torture/compile/20070529-2.c: New test. PR tree-opt/32015 * gcc.c-torture/compile/20070520-1.c: New test. * g++.dg/ext/java-1.C: New test. * gcc.dg/vect/vect-106.c: We are now able to vectorize two loops instead of one. Remove the "can't determine dependence" check. * gcc.dg/tree-ssa/20030815-1.c: Remove testcase which is no longer needed as the cast is gone in the first place. * gcc.dg/max-1.c: Change local variable a to be a global one. * gcc.dg/tree-ssa/ssa-pre-8.c: Update testcase since we don't have a cast which is PREd. From-SVN: r125755
549 lines
14 KiB
C
549 lines
14 KiB
C
/* Handle exceptions for GNU compiler for the Java(TM) language.
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005
|
|
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, 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, 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. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "tree.h"
|
|
#include "real.h"
|
|
#include "rtl.h"
|
|
#include "java-tree.h"
|
|
#include "javaop.h"
|
|
#include "java-opcodes.h"
|
|
#include "jcf.h"
|
|
#include "function.h"
|
|
#include "except.h"
|
|
#include "java-except.h"
|
|
#include "toplev.h"
|
|
|
|
static void expand_start_java_handler (struct eh_range *);
|
|
static struct eh_range *find_handler_in_range (int, struct eh_range *,
|
|
struct eh_range *);
|
|
static void check_start_handlers (struct eh_range *, int);
|
|
static void free_eh_ranges (struct eh_range *range);
|
|
|
|
struct eh_range *current_method_handlers;
|
|
|
|
struct eh_range *current_try_block = NULL;
|
|
|
|
/* These variables are used to speed up find_handler. */
|
|
|
|
static int cache_range_start, cache_range_end;
|
|
static struct eh_range *cache_range;
|
|
static struct eh_range *cache_next_child;
|
|
|
|
/* A dummy range that represents the entire method. */
|
|
|
|
struct eh_range whole_range;
|
|
|
|
/* Check the invariants of the structure we're using to contain
|
|
exception regions. Either returns true or fails an assertion
|
|
check. */
|
|
|
|
bool
|
|
sanity_check_exception_range (struct eh_range *range)
|
|
{
|
|
struct eh_range *ptr = range->first_child;
|
|
for (; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
gcc_assert (ptr->outer == range
|
|
&& ptr->end_pc > ptr->start_pc);
|
|
if (ptr->next_sibling)
|
|
gcc_assert (ptr->next_sibling->start_pc >= ptr->end_pc);
|
|
gcc_assert (ptr->start_pc >= ptr->outer->start_pc
|
|
&& ptr->end_pc <= ptr->outer->end_pc);
|
|
(void) sanity_check_exception_range (ptr);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
extern int is_class_level;
|
|
extern int current_pc;
|
|
extern int binding_depth;
|
|
extern void indent (void);
|
|
static void
|
|
print_ranges (struct eh_range *range)
|
|
{
|
|
if (! range)
|
|
return;
|
|
|
|
struct eh_range *child = range->first_child;
|
|
|
|
indent ();
|
|
fprintf (stderr, "handler pc %d --> %d ", range->start_pc, range->end_pc);
|
|
|
|
tree handler = range->handlers;
|
|
for ( ; handler != NULL_TREE; handler = TREE_CHAIN (handler))
|
|
{
|
|
tree type = TREE_PURPOSE (handler);
|
|
if (type == NULL)
|
|
type = throwable_type_node;
|
|
fprintf (stderr, " type=%s ", IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
|
|
}
|
|
fprintf (stderr, "\n");
|
|
|
|
int saved = binding_depth;
|
|
binding_depth++;
|
|
print_ranges (child);
|
|
binding_depth = saved;
|
|
|
|
print_ranges (range->next_sibling);
|
|
}
|
|
#endif
|
|
|
|
/* Search for the most specific eh_range containing PC.
|
|
Assume PC is within RANGE.
|
|
CHILD is a list of children of RANGE such that any
|
|
previous children have end_pc values that are too low. */
|
|
|
|
static struct eh_range *
|
|
find_handler_in_range (int pc, struct eh_range *range, struct eh_range *child)
|
|
{
|
|
for (; child != NULL; child = child->next_sibling)
|
|
{
|
|
if (pc < child->start_pc)
|
|
break;
|
|
if (pc < child->end_pc)
|
|
return find_handler_in_range (pc, child, child->first_child);
|
|
}
|
|
cache_range = range;
|
|
cache_range_start = pc;
|
|
cache_next_child = child;
|
|
cache_range_end = child == NULL ? range->end_pc : child->start_pc;
|
|
return range;
|
|
}
|
|
|
|
/* Find the inner-most handler that contains PC. */
|
|
|
|
struct eh_range *
|
|
find_handler (int pc)
|
|
{
|
|
struct eh_range *h;
|
|
if (pc >= cache_range_start)
|
|
{
|
|
h = cache_range;
|
|
if (pc < cache_range_end)
|
|
return h;
|
|
while (pc >= h->end_pc)
|
|
{
|
|
cache_next_child = h->next_sibling;
|
|
h = h->outer;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
h = &whole_range;
|
|
cache_next_child = h->first_child;
|
|
}
|
|
return find_handler_in_range (pc, h, cache_next_child);
|
|
}
|
|
|
|
static void
|
|
free_eh_ranges (struct eh_range *range)
|
|
{
|
|
while (range)
|
|
{
|
|
struct eh_range *next = range->next_sibling;
|
|
free_eh_ranges (range->first_child);
|
|
if (range != &whole_range)
|
|
free (range);
|
|
range = next;
|
|
}
|
|
}
|
|
|
|
/* Called to re-initialize the exception machinery for a new method. */
|
|
|
|
void
|
|
method_init_exceptions (void)
|
|
{
|
|
free_eh_ranges (&whole_range);
|
|
whole_range.start_pc = 0;
|
|
whole_range.end_pc = DECL_CODE_LENGTH (current_function_decl) + 1;
|
|
whole_range.outer = NULL;
|
|
whole_range.first_child = NULL;
|
|
whole_range.next_sibling = NULL;
|
|
cache_range_start = 0xFFFFFF;
|
|
}
|
|
|
|
/* Split an exception range into two at PC. The sub-ranges that
|
|
belong to the range are split and distributed between the two new
|
|
ranges. */
|
|
|
|
static void
|
|
split_range (struct eh_range *range, int pc)
|
|
{
|
|
struct eh_range *ptr;
|
|
struct eh_range **first_child, **second_child;
|
|
struct eh_range *h;
|
|
|
|
/* First, split all the sub-ranges. */
|
|
for (ptr = range->first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (pc > ptr->start_pc
|
|
&& pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, pc);
|
|
}
|
|
}
|
|
|
|
/* Create a new range. */
|
|
h = XNEW (struct eh_range);
|
|
|
|
h->start_pc = pc;
|
|
h->end_pc = range->end_pc;
|
|
h->next_sibling = range->next_sibling;
|
|
range->next_sibling = h;
|
|
range->end_pc = pc;
|
|
h->handlers = build_tree_list (TREE_PURPOSE (range->handlers),
|
|
TREE_VALUE (range->handlers));
|
|
h->next_sibling = NULL;
|
|
h->expanded = 0;
|
|
h->stmt = NULL;
|
|
h->outer = range->outer;
|
|
h->first_child = NULL;
|
|
|
|
ptr = range->first_child;
|
|
first_child = &range->first_child;
|
|
second_child = &h->first_child;
|
|
|
|
/* Distribute the sub-ranges between the two new ranges. */
|
|
for (ptr = range->first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (ptr->start_pc < pc)
|
|
{
|
|
*first_child = ptr;
|
|
ptr->outer = range;
|
|
first_child = &ptr->next_sibling;
|
|
}
|
|
else
|
|
{
|
|
*second_child = ptr;
|
|
ptr->outer = h;
|
|
second_child = &ptr->next_sibling;
|
|
}
|
|
}
|
|
*first_child = NULL;
|
|
*second_child = NULL;
|
|
}
|
|
|
|
|
|
/* Add an exception range.
|
|
|
|
There are some missed optimization opportunities here. For
|
|
example, some bytecode obfuscators generate seemingly
|
|
nonoverlapping exception ranges which, when coalesced, do in fact
|
|
nest correctly. We could merge these, but we'd have to fix up all
|
|
the enclosed regions first and perhaps create a new range anyway if
|
|
it overlapped existing ranges.
|
|
|
|
Also, we don't attempt to detect the case where two previously
|
|
added disjoint ranges could be coalesced by a new range. */
|
|
|
|
void
|
|
add_handler (int start_pc, int end_pc, tree handler, tree type)
|
|
{
|
|
struct eh_range *ptr, *h;
|
|
struct eh_range **first_child, **prev;
|
|
|
|
/* First, split all the existing ranges that we need to enclose. */
|
|
for (ptr = whole_range.first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (start_pc > ptr->start_pc
|
|
&& start_pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, start_pc);
|
|
}
|
|
|
|
if (end_pc > ptr->start_pc
|
|
&& end_pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, end_pc);
|
|
}
|
|
|
|
if (ptr->start_pc >= end_pc)
|
|
break;
|
|
}
|
|
|
|
/* Create the new range. */
|
|
h = XNEW (struct eh_range);
|
|
first_child = &h->first_child;
|
|
|
|
h->start_pc = start_pc;
|
|
h->end_pc = end_pc;
|
|
h->first_child = NULL;
|
|
h->outer = NULL_EH_RANGE;
|
|
h->handlers = build_tree_list (type, handler);
|
|
h->next_sibling = NULL;
|
|
h->expanded = 0;
|
|
h->stmt = NULL;
|
|
|
|
/* Find every range at the top level that will be a sub-range of the
|
|
range we're inserting and make it so. */
|
|
{
|
|
struct eh_range **prev = &whole_range.first_child;
|
|
for (ptr = *prev; ptr;)
|
|
{
|
|
struct eh_range *next = ptr->next_sibling;
|
|
|
|
if (ptr->start_pc >= end_pc)
|
|
break;
|
|
|
|
if (ptr->start_pc < start_pc)
|
|
{
|
|
prev = &ptr->next_sibling;
|
|
}
|
|
else if (ptr->start_pc >= start_pc
|
|
&& ptr->start_pc < end_pc)
|
|
{
|
|
*prev = next;
|
|
*first_child = ptr;
|
|
first_child = &ptr->next_sibling;
|
|
ptr->outer = h;
|
|
ptr->next_sibling = NULL;
|
|
}
|
|
|
|
ptr = next;
|
|
}
|
|
}
|
|
|
|
/* Find the right place to insert the new range. */
|
|
prev = &whole_range.first_child;
|
|
for (ptr = *prev; ptr; prev = &ptr->next_sibling, ptr = ptr->next_sibling)
|
|
{
|
|
gcc_assert (ptr->outer == NULL_EH_RANGE);
|
|
if (ptr->start_pc >= start_pc)
|
|
break;
|
|
}
|
|
|
|
/* And insert it there. */
|
|
*prev = h;
|
|
if (ptr)
|
|
{
|
|
h->next_sibling = ptr;
|
|
h->outer = ptr->outer;
|
|
}
|
|
}
|
|
|
|
|
|
/* if there are any handlers for this range, issue start of region */
|
|
static void
|
|
expand_start_java_handler (struct eh_range *range)
|
|
{
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
indent ();
|
|
fprintf (stderr, "expand start handler pc %d --> %d\n",
|
|
current_pc, range->end_pc);
|
|
#endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */
|
|
pushlevel (0);
|
|
register_exception_range (range, range->start_pc, range->end_pc);
|
|
range->expanded = 1;
|
|
}
|
|
|
|
tree
|
|
prepare_eh_table_type (tree type)
|
|
{
|
|
tree exp;
|
|
tree *slot;
|
|
const char *name;
|
|
char *buf;
|
|
tree decl;
|
|
tree utf8_ref;
|
|
|
|
/* The "type" (match_info) in a (Java) exception table is a pointer to:
|
|
* a) NULL - meaning match any type in a try-finally.
|
|
* b) a pointer to a pointer to a class.
|
|
* c) a pointer to a pointer to a utf8_ref. The pointer is
|
|
* rewritten to point to the appropriate class. */
|
|
|
|
if (type == NULL_TREE)
|
|
return NULL_TREE;
|
|
|
|
if (TYPE_TO_RUNTIME_MAP (output_class) == NULL)
|
|
TYPE_TO_RUNTIME_MAP (output_class) = java_treetreehash_create (10, 1);
|
|
|
|
slot = java_treetreehash_new (TYPE_TO_RUNTIME_MAP (output_class), type);
|
|
if (*slot != NULL)
|
|
return TREE_VALUE (*slot);
|
|
|
|
if (is_compiled_class (type) && !flag_indirect_dispatch)
|
|
{
|
|
name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
|
|
buf = alloca (strlen (name) + 5);
|
|
sprintf (buf, "%s_ref", name);
|
|
decl = build_decl (VAR_DECL, get_identifier (buf), ptr_type_node);
|
|
TREE_STATIC (decl) = 1;
|
|
DECL_ARTIFICIAL (decl) = 1;
|
|
DECL_IGNORED_P (decl) = 1;
|
|
TREE_READONLY (decl) = 1;
|
|
TREE_THIS_VOLATILE (decl) = 0;
|
|
DECL_INITIAL (decl) = build_class_ref (type);
|
|
layout_decl (decl, 0);
|
|
pushdecl (decl);
|
|
exp = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (decl)), decl);
|
|
}
|
|
else
|
|
{
|
|
utf8_ref = build_utf8_ref (DECL_NAME (TYPE_NAME (type)));
|
|
name = IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (utf8_ref, 0)));
|
|
buf = alloca (strlen (name) + 5);
|
|
sprintf (buf, "%s_ref", name);
|
|
decl = build_decl (VAR_DECL, get_identifier (buf), utf8const_ptr_type);
|
|
TREE_STATIC (decl) = 1;
|
|
DECL_ARTIFICIAL (decl) = 1;
|
|
DECL_IGNORED_P (decl) = 1;
|
|
TREE_READONLY (decl) = 1;
|
|
TREE_THIS_VOLATILE (decl) = 0;
|
|
layout_decl (decl, 0);
|
|
pushdecl (decl);
|
|
exp = build1 (ADDR_EXPR, build_pointer_type (utf8const_ptr_type), decl);
|
|
TYPE_CATCH_CLASSES (output_class) =
|
|
tree_cons (NULL, make_catch_class_record (exp, utf8_ref),
|
|
TYPE_CATCH_CLASSES (output_class));
|
|
}
|
|
|
|
exp = convert (ptr_type_node, exp);
|
|
|
|
*slot = tree_cons (type, exp, NULL_TREE);
|
|
|
|
return exp;
|
|
}
|
|
|
|
static int
|
|
expand_catch_class (void **entry, void *x ATTRIBUTE_UNUSED)
|
|
{
|
|
struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry;
|
|
tree addr = TREE_VALUE ((tree)ite->value);
|
|
tree decl;
|
|
STRIP_NOPS (addr);
|
|
decl = TREE_OPERAND (addr, 0);
|
|
rest_of_decl_compilation (decl, global_bindings_p (), 0);
|
|
return true;
|
|
}
|
|
|
|
/* For every class in the TYPE_TO_RUNTIME_MAP, expand the
|
|
corresponding object that is used by the runtime type matcher. */
|
|
|
|
void
|
|
java_expand_catch_classes (tree this_class)
|
|
{
|
|
if (TYPE_TO_RUNTIME_MAP (this_class))
|
|
htab_traverse
|
|
(TYPE_TO_RUNTIME_MAP (this_class),
|
|
expand_catch_class, NULL);
|
|
}
|
|
|
|
/* Build a reference to the jthrowable object being carried in the
|
|
exception header. */
|
|
|
|
tree
|
|
build_exception_object_ref (tree type)
|
|
{
|
|
tree obj;
|
|
|
|
/* Java only passes object via pointer and doesn't require adjusting.
|
|
The java object is immediately before the generic exception header. */
|
|
obj = build0 (EXC_PTR_EXPR, build_pointer_type (type));
|
|
obj = build2 (POINTER_PLUS_EXPR, TREE_TYPE (obj), obj,
|
|
fold_build1 (NEGATE_EXPR, sizetype,
|
|
TYPE_SIZE_UNIT (TREE_TYPE (obj))));
|
|
obj = build1 (INDIRECT_REF, type, obj);
|
|
|
|
return obj;
|
|
}
|
|
|
|
/* If there are any handlers for this range, issue end of range,
|
|
and then all handler blocks */
|
|
void
|
|
expand_end_java_handler (struct eh_range *range)
|
|
{
|
|
tree handler = range->handlers;
|
|
|
|
for ( ; handler != NULL_TREE; handler = TREE_CHAIN (handler))
|
|
{
|
|
/* For bytecode we treat exceptions a little unusually. A
|
|
`finally' clause looks like an ordinary exception handler for
|
|
Throwable. The reason for this is that the bytecode has
|
|
already expanded the finally logic, and we would have to do
|
|
extra (and difficult) work to get this to look like a
|
|
gcc-style finally clause. */
|
|
tree type = TREE_PURPOSE (handler);
|
|
if (type == NULL)
|
|
type = throwable_type_node;
|
|
type = prepare_eh_table_type (type);
|
|
|
|
{
|
|
tree catch_expr = build2 (CATCH_EXPR, void_type_node, type,
|
|
build1 (GOTO_EXPR, void_type_node,
|
|
TREE_VALUE (handler)));
|
|
tree try_catch_expr = build2 (TRY_CATCH_EXPR, void_type_node,
|
|
*get_stmts (), catch_expr);
|
|
*get_stmts () = try_catch_expr;
|
|
}
|
|
}
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
indent ();
|
|
fprintf (stderr, "expand end handler pc %d <-- %d\n",
|
|
current_pc, range->start_pc);
|
|
#endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */
|
|
}
|
|
|
|
/* Recursive helper routine for maybe_start_handlers. */
|
|
|
|
static void
|
|
check_start_handlers (struct eh_range *range, int pc)
|
|
{
|
|
if (range != NULL_EH_RANGE && range->start_pc == pc)
|
|
{
|
|
check_start_handlers (range->outer, pc);
|
|
if (!range->expanded)
|
|
expand_start_java_handler (range);
|
|
}
|
|
}
|
|
|
|
|
|
static struct eh_range *current_range;
|
|
|
|
/* Emit any start-of-try-range starting at start_pc and ending after
|
|
end_pc. */
|
|
|
|
void
|
|
maybe_start_try (int start_pc, int end_pc)
|
|
{
|
|
struct eh_range *range;
|
|
if (! doing_eh (1))
|
|
return;
|
|
|
|
range = find_handler (start_pc);
|
|
while (range != NULL_EH_RANGE && range->start_pc == start_pc
|
|
&& range->end_pc < end_pc)
|
|
range = range->outer;
|
|
|
|
current_range = range;
|
|
check_start_handlers (range, start_pc);
|
|
}
|
|
|