From 0286a91d403c41cc555b534afa9bc37aa1f657c8 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Tue, 4 Sep 2001 14:50:31 -0700 Subject: [PATCH] parse.y (maybe_yank_clinit): A field without an initializer is not relevant. * parse.y (maybe_yank_clinit): A field without an initializer is not relevant. All initializers except static final and constant require , regardless of flag_emit_class_files. From-SVN: r45388 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/parse.y | 20 ++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3a92114ba54..0f1973822b3 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-09-01 Per Bothner + + * parse.y (maybe_yank_clinit): A field without an initializer is not + relevant. All initializers except static final and constant require + , regardless of flag_emit_class_files. + 2001-08-31 Per Bothner * class.c (set_constant_value): When not emiting class files, then a diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 09a4dcd6ce0..698f42274e8 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -7862,6 +7862,12 @@ maybe_yank_clinit (mdecl) if (!FIELD_STATIC (current)) continue; + /* nor in fields with initializers. */ + f_init = DECL_INITIAL (current); + + if (f_init == NULL_TREE) + continue; + /* Anything that isn't String or a basic type is ruled out -- or if we know how to deal with it (when doing things natively) we should generated an empty so that SUID are computed @@ -7869,18 +7875,8 @@ maybe_yank_clinit (mdecl) if (! JSTRING_TYPE_P (TREE_TYPE (current)) && ! JNUMERIC_TYPE_P (TREE_TYPE (current))) break; - - f_init = DECL_INITIAL (current); - /* If we're emitting native code, we want static final fields to - have constant initializers. If we don't meet these - conditions, we keep */ - if (!flag_emit_class_files - && !(FIELD_FINAL (current) && f_init && TREE_CONSTANT (f_init))) - break; - /* If we're emitting bytecode, we want static fields to have - constant initializers or no initializer. If we don't meet - these conditions, we keep */ - if (flag_emit_class_files && f_init && !TREE_CONSTANT (f_init)) + + if (! FIELD_FINAL (current) || ! TREE_CONSTANT (f_init)) break; }