From 493d561d623fe14141c5dba6ddd98a8271c67e69 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Wed, 24 Jan 2001 08:08:36 +0000 Subject: class.c (layout_class): Don't lay the superclass out if it's already being laid out. 2001-01-23 Alexandre Petit-Bianco * class.c (layout_class): Don't lay the superclass out if it's already being laid out. * jcf-parse.c (handle_innerclass_attribute): New function. (HANDLE_INNERCLASSES_ATTRIBUTE): Invoke handle_innerclasses_attribute. (jcf_parse): Don't load an innerclasses if it's already being laid out. * jcf-write.c (append_innerclass_attribute_entry): Static `anonymous_name' and its initialization deleted. `ocii' and `ini' to be zero for anonymous classes. 2001-01-23 Alexandre Petit-Bianco * class.c (set_constant_value): Set DECL_FIELD_FINAL_IUD if necessary. * jcf-parse.c (set_source_filename): Use MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC if necessary. 2001-01-23 Alexandre Petit-Bianco * expr.c (build_jni_stub): Set DECL_CONTEXT on `meth_var' so it gets a unique asm name. 2001-01-23 Alexandre Petit-Bianco * jcf-parse.c (HANDLE_END_METHODS): Nullify current_method. (HANDLE_START_FIELD): Invoke MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC if necessary. (HANDLE_SYNTHETIC_ATTRIBUTE): New macro. * jcf-reader.c (get_attribute): Handle `Synthetic' attribute. * parse.y (lookup_package_type_and_set_next): Deleted. (resolve_package): Removed unnecessary code. (find_applicable_accessible_methods_list): `finit$' can't be inherited. * verify.c (pop_argument_types): Added missing prototype. (http://gcc.gnu.org/ml/gcc-patches/2001-01/msg01812.html) From-SVN: r39230 --- gcc/java/class.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gcc/java/class.c') diff --git a/gcc/java/class.c b/gcc/java/class.c index f98a5d7..3d88143 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -743,7 +743,11 @@ set_constant_value (field, constant) warning ("duplicate ConstanValue atribute for field '%s'", IDENTIFIER_POINTER (DECL_NAME (field))); else - DECL_INITIAL (field) = constant; + { + DECL_INITIAL (field) = constant; + if (FIELD_FINAL (field)) + DECL_FIELD_FINAL_IUD (field) = 1; + } } /* Count the number of Unicode chars encoded in a given Ut8 string. */ @@ -1655,7 +1659,7 @@ layout_class (this_class) } CLASS_BEING_LAIDOUT (this_class) = 1; - if (super_class) + if (super_class && !CLASS_BEING_LAIDOUT (super_class)) { tree maybe_super_class = maybe_layout_super_class (super_class, this_class); -- cgit v1.1