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
This commit is contained in:
parent
0ba28a6d48
commit
82712f8b74
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user