diff options
author | Richard Kenner <kenner@vlsi1.ultra.nyu.edu> | 2000-02-29 02:34:48 +0000 |
---|---|---|
committer | Richard Kenner <kenner@gcc.gnu.org> | 2000-02-28 21:34:48 -0500 |
commit | 9df2c88cf7ee9be1a279bf7e1fc032b77d9bb56f (patch) | |
tree | 9d32681a03d3ca309091c1dee14f1053a1621f84 /gcc/stor-layout.c | |
parent | c27ba9120aa6d7a4477315f359088ea7e4267bd3 (diff) | |
download | gcc-9df2c88cf7ee9be1a279bf7e1fc032b77d9bb56f.tar.gz |
* 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
Diffstat (limited to 'gcc/stor-layout.c')
-rw-r--r-- | gcc/stor-layout.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index b86a42290cc..83a220abdf8 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -265,13 +265,20 @@ layout_decl (decl, known_align) { register tree type = TREE_TYPE (decl); register enum tree_code code = TREE_CODE (decl); - int spec_size = DECL_FIELD_SIZE (decl); + HOST_WIDE_INT spec_size = 0; if (code == CONST_DECL) return; - - if (code != VAR_DECL && code != PARM_DECL && code != RESULT_DECL - && code != FIELD_DECL && code != TYPE_DECL) + else if (code == FIELD_DECL) + { + if (DECL_SIZE (decl) != 0) + { + spec_size = TREE_INT_CST_LOW (DECL_SIZE (decl)); + DECL_SIZE (decl) = 0; + } + } + else if (code != VAR_DECL && code != PARM_DECL && code != RESULT_DECL + && code != TYPE_DECL) abort (); if (type == error_mark_node) |