diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-08-17 15:19:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-08-17 15:19:39 +0000 |
| commit | 3d4e2766256df1da1986d4819ed1d184a7b1856b (patch) | |
| tree | b4740b1c9b8809e0eb41a3c75d252ad2c54600a1 /gcc/java/expr.c | |
| parent | 4bf6c438d2117f8473b36b84eb8bd44487631efa (diff) | |
| download | gcc-3d4e2766256df1da1986d4819ed1d184a7b1856b.zip gcc-3d4e2766256df1da1986d4819ed1d184a7b1856b.tar.gz gcc-3d4e2766256df1da1986d4819ed1d184a7b1856b.tar.bz2 | |
tree.h (struct tree_label_decl): Removed old "java" fields.
gcc:
* tree.h (struct tree_label_decl): Removed old "java" fields.
gcc/java:
* java-tree.h (LABEL_TYPE_STATE): Removed.
(load_type_state): Removed.
(LABEL_PC): Removed.
(LABEL_VERIFIED): Removed.
(type_states): Declare.
* expr.c (type_states): New global.
(load_type_state): Now static. Use type_states. Changed
argument.
(lookup_label): Don't set LABEL_PC.
(expand_byte_code): Don't use LABEL_VERIFIED.
(note_instructions): Initialize type_states.
* verify-glue.c (vfy_note_stack_depth): Rewrote.
(vfy_note_stack_type): Use type_states.
(vfy_note_local_type): Likewise.
From-SVN: r127587
Diffstat (limited to 'gcc/java/expr.c')
| -rw-r--r-- | gcc/java/expr.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 8772b69..c222a65 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -1772,7 +1772,6 @@ lookup_label (int pc) { /* The type of the address of a label is return_address_type_node. */ tree decl = create_label_decl (name); - LABEL_PC (decl) = pc; return pushdecl (decl); } } @@ -1801,9 +1800,15 @@ create_label_decl (tree name) return decl; } -/* This maps a bytecode offset (PC) to various flags. */ +/* This maps a bytecode offset (PC) to various flags. */ char *instruction_bits; +/* This is a vector of type states for the current method. It is + indexed by PC. Each element is a tree vector holding the type + state at that PC. We only note type states at basic block + boundaries. */ +VEC(tree, gc) *type_states; + static void note_label (int current_pc ATTRIBUTE_UNUSED, int target_pc) { @@ -2953,11 +2958,11 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index) TREE_THIS_VOLATILE (field_ref) = TREE_THIS_VOLATILE (field_decl); } -void -load_type_state (tree label) +static void +load_type_state (int pc) { int i; - tree vec = LABEL_TYPE_STATE (label); + tree vec = VEC_index (tree, type_states, pc); int cur_length = TREE_VEC_LENGTH (vec); stack_pointer = cur_length - DECL_MAX_LOCALS(current_function_decl); for (i = 0; i < cur_length; i++) @@ -3000,6 +3005,8 @@ note_instructions (JCF *jcf, tree method) byte_ops = jcf->read_ptr; instruction_bits = xrealloc (instruction_bits, length + 1); memset (instruction_bits, 0, length + 1); + type_states = VEC_alloc (tree, gc, length + 1); + VEC_safe_grow_cleared (tree, gc, type_states, length + 1); /* This pass figures out which PC can be the targets of jumps. */ for (PC = 0; PC < length;) @@ -3158,8 +3165,8 @@ expand_byte_code (JCF *jcf, tree method) flush_quick_stack (); if ((instruction_bits [PC] & BCODE_TARGET) != 0) java_add_stmt (build1 (LABEL_EXPR, void_type_node, label)); - if (LABEL_VERIFIED (label) || PC == 0) - load_type_state (label); + if ((instruction_bits[PC] & BCODE_VERIFIED) != 0) + load_type_state (PC); } if (! (instruction_bits [PC] & BCODE_VERIFIED)) |