diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2001-12-21 19:15:36 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-12-21 19:15:36 +0000 |
| commit | 82712f8b746a5ba02aeab77deb4a437cf8604b0e (patch) | |
| tree | b3d0be987747d095e465e772a05f7e4f8a491155 /gcc/java | |
| parent | 0ba28a6d484b7aab09c57af8d36e3b789a443c3f (diff) | |
| download | gcc-82712f8b746a5ba02aeab77deb4a437cf8604b0e.zip gcc-82712f8b746a5ba02aeab77deb4a437cf8604b0e.tar.gz gcc-82712f8b746a5ba02aeab77deb4a437cf8604b0e.tar.bz2 | |
For PR java/4509:
* parse.y (java_complete_lhs) [COMPOUND_EXPR]: Correctly compute
CAN_COMPLETE_NORMALLY for the node.
* jcf-write.c (generate_bytecode_insns) [COMPOUND_EXPR]: Don't
generate code for second branch if first branch can't complete
normally.
(generate_bytecode_insns) [LOOP_EXPR]: Don't generate `goto' to
the loop head if the loop body can't complete normally.
From-SVN: r48249
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/parse.y | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 7c50c97..b3f383c 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -5232,14 +5232,23 @@ check_inner_circular_reference (source, target) if (!basetype_vec) return NULL_TREE; - + for (i = 0; i < TREE_VEC_LENGTH (basetype_vec); i++) { - tree su = BINFO_TYPE (TREE_VEC_ELT (basetype_vec, i)); + tree su; + + /* We can end up with a NULL_TREE or an incomplete type here if + we are compiling multiple files at once. It's safe to simply + ignore these cases. */ + if (TREE_VEC_ELT (basetype_vec, i) == NULL_TREE) + continue; + su = BINFO_TYPE (TREE_VEC_ELT (basetype_vec, i)); + if (INCOMPLETE_TYPE_P (su)) + continue; if (inherits_from_p (su, target)) return lookup_cl (TYPE_NAME (su)); - + for (ctx = DECL_CONTEXT (TYPE_NAME (su)); ctx; ctx = DECL_CONTEXT (ctx)) { /* An enclosing context shouldn't be TARGET */ |