diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 4 | ||||
| -rw-r--r-- | gcc/java/parse.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 31b6090..8b512a3 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 28 08:20:42 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> + + * java-tree.h (LABEL_PC): Relect name changes in ../tree.h. + (DECL_BIT_INDEX): Use underlying representation. + * parse.h (DECL_INHERITED_SOURCE_LINE): Likewise. + Sun Feb 27 16:40:33 2000 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * expr.c (build_java_ret): Pass proper type to size_binop. diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 0699461..5cfd533 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -402,7 +402,7 @@ struct lang_identifier #define LABEL_PENDING_CHAIN(NODE) DECL_RESULT(NODE) /* In a LABEL_DECL, the corresponding bytecode program counter. */ -#define LABEL_PC(NODE) ((NODE)->decl.saved_insns.i) +#define LABEL_PC(NODE) ((NODE)->decl.u2.i) /* Used during verification to mark the label has "changed". (See JVM Spec). */ #define LABEL_CHANGED(NODE) DECL_LANG_FLAG_6(NODE) @@ -440,7 +440,7 @@ struct lang_identifier /* For a local VAR_DECL, holds the index into a words bitstring that specifies if this decl is definitively assigned. A DECL_BIT_INDEX of -1 means we no longer care. */ -#define DECL_BIT_INDEX(DECL) DECL_FIELD_SIZE(DECL) +#define DECL_BIT_INDEX(DECL) (DECL_CHECK (DECL)->decl.u2.i) /* DECL_LANG_SPECIFIC for FUNCTION_DECLs. */ struct lang_decl diff --git a/gcc/java/parse.h b/gcc/java/parse.h index 41cb0e9..ddc8fc1 100644 --- a/gcc/java/parse.h +++ b/gcc/java/parse.h @@ -593,7 +593,7 @@ typedef struct _jdeplist { /* Macro for the xreferencer */ #define DECL_END_SOURCE_LINE(DECL) DECL_FRAME_SIZE (DECL) -#define DECL_INHERITED_SOURCE_LINE(DECL) DECL_FIELD_SIZE (DECL) +#define DECL_INHERITED_SOURCE_LINE(DECL) (DECL_CHECK (DECL)->decl.u2.i) /* Parser context data structure. */ struct parser_ctxt { |