diff options
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/java-gimplify.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e172f97..e75ebd0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,11 @@ 2004-09-23 Tom Tromey <tromey@redhat.com> + PR java/17329: + * java-gimplify.c (java_gimplify_expr) <SAVE_EXPR>: Ignore case + where operand is null. + +2004-09-23 Tom Tromey <tromey@redhat.com> + PR java/17380: * parse.y (not_accessible_p): Allow access to protected members even when class is not static. diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c index 54d5c75..664eb9a 100644 --- a/gcc/java/java-gimplify.c +++ b/gcc/java/java-gimplify.c @@ -108,7 +108,10 @@ java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED, return GS_UNHANDLED; case SAVE_EXPR: - if (TREE_CODE (TREE_OPERAND (*expr_p, 0)) == VAR_DECL) + /* Note that we can see <save_expr NULL> if the save_expr was + already handled by gimplify_save_expr. */ + if (TREE_OPERAND (*expr_p, 0) != NULL_TREE + && TREE_CODE (TREE_OPERAND (*expr_p, 0)) == VAR_DECL) TREE_OPERAND (*expr_p, 0) = java_replace_reference (TREE_OPERAND (*expr_p, 0), /* want_lvalue */ false); |