diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-17 15:19:39 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-17 15:19:39 +0000 |
| commit | 638e4b601d7a084f2a2b51c2aa8f50341e8dc0f7 (patch) | |
| tree | b4740b1c9b8809e0eb41a3c75d252ad2c54600a1 /gcc/java/java-tree.h | |
| parent | f8520ad797ec8cbb3919b39111f411babfe46e86 (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127587 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/java-tree.h')
| -rw-r--r-- | gcc/java/java-tree.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 34fe5c05a0da..29902de91388 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -771,16 +771,6 @@ union lang_tree_node FIELD_LOCAL_ALIAS. */ #define FIELD_THISN(DECL) DECL_LANG_FLAG_7 (VAR_OR_FIELD_CHECK (DECL)) -/* In a LABEL_DECL, a TREE_VEC that saves the type_map at that point. */ -#define LABEL_TYPE_STATE(NODE) (LABEL_DECL_CHECK (NODE)->label_decl.java_field_1) - -/* In a LABEL_DECL, the corresponding bytecode program counter. */ -#define LABEL_PC(NODE) (LABEL_DECL_CHECK (NODE)->label_decl.java_field_4) - -/* In a LABEL_DECL, true if we have verified instructions starting here. */ -#define LABEL_VERIFIED(NODE) \ - (instruction_bits[LABEL_PC (NODE)] & BCODE_VERIFIED) - /* The slot number for this local variable. */ #define DECL_LOCAL_SLOT_NUMBER(NODE) \ (DECL_LANG_SPECIFIC (NODE)->u.v.slot_number) @@ -1248,7 +1238,6 @@ extern void set_local_type (int, tree); extern int merge_type_state (tree); extern int push_type_0 (tree); extern void push_type (tree); -extern void load_type_state (tree); extern void add_interface (tree, tree); extern tree force_evaluation_order (tree); extern tree java_create_object (tree); @@ -1418,6 +1407,9 @@ extern void rewrite_reflection_indexes (void *); /* Use CLASS_LOADED_P? FIXME */ #define CLASS_COMPLETE_P(DECL) DECL_LANG_FLAG_2 (DECL) +/* A vector used to track type states for the current method. */ +extern VEC(tree, gc) *type_states; + /* This maps a bytecode offset (PC) to various flags, listed below (starting with BCODE_). */ extern char *instruction_bits; |