diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 2001-01-24 08:08:36 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2001-01-24 00:08:36 -0800 |
| commit | 493d561d623fe14141c5dba6ddd98a8271c67e69 (patch) | |
| tree | b3ca35263ce6de5b0c268b75d5186f60cd6b2f19 /gcc/java/class.c | |
| parent | 0851111417ad065a9513312dede39bcfa2491516 (diff) | |
| download | gcc-493d561d623fe14141c5dba6ddd98a8271c67e69.zip gcc-493d561d623fe14141c5dba6ddd98a8271c67e69.tar.gz gcc-493d561d623fe14141c5dba6ddd98a8271c67e69.tar.bz2 | |
class.c (layout_class): Don't lay the superclass out if it's already being laid out.
2001-01-23 Alexandre Petit-Bianco <apbianco@cygnus.com>
* 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 <apbianco@cygnus.com>
* 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 <apbianco@cygnus.com>
* expr.c (build_jni_stub): Set DECL_CONTEXT on `meth_var' so it
gets a unique asm name.
2001-01-23 Alexandre Petit-Bianco <apbianco@cygnus.com>
* 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
Diffstat (limited to 'gcc/java/class.c')
| -rw-r--r-- | gcc/java/class.c | 8 |
1 files changed, 6 insertions, 2 deletions
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); |