From 9df2c88cf7ee9be1a279bf7e1fc032b77d9bb56f Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Tue, 29 Feb 2000 02:34:48 +0000 Subject: * Eliminate DECL_FIELD_SIZE. * builtins.c (built_in_class_names, built_in_names): New variables. * c-decl.c (finish_struct): Set specified size in DECL_SIZE. * expr.c (expand_expr, case COMPONENT_REF): Get field size from DECL_SIZE, not DECL_FIELD_SIZE. * print-tree.c (print_node): Remove code that prints extra blank lines in some cases. Properly handle inline and builtin function cases. * stor-layout.c (layout_decl): Get specified size from DEC_SIZE. * tree.h (built_in_class_named, built_in_names): New declarations. (union tree_decl): Rename internal unions to u1 and u2 and change some of their components. Add new field built_in_class. (DECL_ALIGN, DECL_INCOMING_RTL, DECL_SAVED_INSNS, DECL_FRAME_SIZE): Reflect above changes. (DECL_FUNCTION_CODE, DECL_BUILT_IN_CLASS): Likewise. (DECL_SET_FUNCTION_CODE, DECL_FIELD_SIZE): Deleted. * objc/objc-act.c (objc_copy_list): Use DECL_SIZE, not DECL_FIELD_SIZE. (encode_field_decl): Likewise; also remove obsolete test for bitfield. * ch/ch-tree.h (DECL_ACTION_NESTING_LEVEL): Use new tree union name. * ch/decl.c (finish_struct): Don't clear DECL_FIELD_SIZE. * ch/typeck.c (make_chill_struct_type): Likewise. (apply_decl_field_layout): General cleanup. Set DECL_SIZE instead of DECL_FIELD_SIZE. * cp/class.c (build_vtbl_or_vbase_field, check_methods): Don't clear DECL_FIELD_SIZE. (check_bitfield_decl, check_field_decls): Set DECL_SIZE, not DECL_FIELD_SIZE. * cp/rtti.c (expand_class_desc): Likewise. * cp/cp-tree.h (DECL_INIT_PRIORITY): Use underlying union name. (THUNK_VCALL_OFFSET): Likewise. (THUNK_DELTA): Reflect changes in ../tree.h. * java/java-tree.h (LABEL_PC): Relect name changes in ../tree.h. (DECL_BIT_INDEX): Use underlying representation. * java/parse.h (DECL_INHERITED_SOURCE_LINE): Likewise. From-SVN: r32249 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/java-tree.h | 4 ++-- gcc/java/parse.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gcc/java') 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 + + * 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 * 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 { -- cgit v1.1