diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-09-24 15:39:17 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-09-24 15:39:17 +0000 |
| commit | 90424847a67993e2cb9b0832371f45b2b64d9048 (patch) | |
| tree | 716092990a2a64abdb5612e435b1a99a3f1f51b0 | |
| parent | 17c08c32dedfe91dbd6cea4f24d9216630f9aaa9 (diff) | |
| download | gcc-90424847a67993e2cb9b0832371f45b2b64d9048.zip gcc-90424847a67993e2cb9b0832371f45b2b64d9048.tar.gz gcc-90424847a67993e2cb9b0832371f45b2b64d9048.tar.bz2 | |
re PR java/16789 (ICE in force_evaluation_order() on valid code)
PR java/16789:
* parse.y (resolve_qualified_expression_name): Set
CAN_COMPLETE_NORMALLY on first call when chaining static calls.
* expr.c (force_evaluation_order): Check for empty argument list
after stripping COMPOUND_EXPR.
From-SVN: r88045
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/expr.c | 9 | ||||
| -rw-r--r-- | gcc/java/parse.y | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 0e2b8b1..f66e444 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2004-09-24 Tom Tromey <tromey@redhat.com> + + PR java/16789: + * parse.y (resolve_qualified_expression_name): Set + CAN_COMPLETE_NORMALLY on first call when chaining static calls. + * expr.c (force_evaluation_order): Check for empty argument list + after stripping COMPOUND_EXPR. + 2004-09-23 Andrew Haley <aph@redhat.com> PR java/16927: diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 33d3afd..33c048f 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -3178,9 +3178,6 @@ force_evaluation_order (tree node) { tree arg, cmp; - if (!TREE_OPERAND (node, 1)) - return node; - arg = node; /* Position arg properly, account for wrapped around ctors. */ @@ -3189,7 +3186,11 @@ force_evaluation_order (tree node) arg = TREE_OPERAND (arg, 1); - /* Not having a list of argument here is an error. */ + /* An empty argument list is ok, just ignore it. */ + if (!arg) + return node; + + /* Not having a list of arguments here is an error. */ if (TREE_CODE (arg) != TREE_LIST) abort (); diff --git a/gcc/java/parse.y b/gcc/java/parse.y index b6cedbf..2287d90 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -9607,6 +9607,9 @@ resolve_qualified_expression_name (tree wfl, tree *found_decl, forcoming function's argument. */ if (previous_call_static && is_static) { + /* We must set CAN_COMPLETE_NORMALLY for the first call + since it is done nowhere else. */ + CAN_COMPLETE_NORMALLY (decl) = 1; decl = build2 (COMPOUND_EXPR, TREE_TYPE (*where_found), decl, *where_found); TREE_SIDE_EFFECTS (decl) = 1; |