diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index f6116e536f8..453641b915e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,10 @@ 2001-04-06 Tom Tromey <tromey@redhat.com> + * parse.y (analyze_clinit_body): Return true if the second operand + of a METHOD_EXPR is nonzero. + +2001-04-06 Tom Tromey <tromey@redhat.com> + * Make-lang.in ($(srcdir)/java/parse-scan.c): Run bison from build directory. ($(srcdir)/java/parse.c): Likewise. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 40324098d65..c0b9100ad05 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -7546,7 +7546,7 @@ maybe_generate_pre_expand_clinit (class_type) } /* Analyzes a method body and look for something that isn't a - MODIFY_EXPR. */ + MODIFY_EXPR with a constant value. */ static int analyze_clinit_body (bbody) @@ -7570,11 +7570,10 @@ analyze_clinit_body (bbody) break; case MODIFY_EXPR: - bbody = NULL_TREE; - break; + /* Return 0 if the operand is constant, 1 otherwise. */ + return ! TREE_CONSTANT (TREE_OPERAND (bbody, 1)); default: - bbody = NULL_TREE; return 1; } return 0; |
