From: Tobias Burnus Date: Tue, 16 Jul 2013 20:54:37 +0000 (+0200) Subject: re PR fortran/57912 (gfortran/coarray/alloc_comp_2.f90 ICE) X-Git-Tag: releases/gcc-4.9.0~4994 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1adb7c4a00957cf4669fb356e528ea520a837f2;p=thirdparty%2Fgcc.git re PR fortran/57912 (gfortran/coarray/alloc_comp_2.f90 ICE) 2013-07-16 Tobias Burnus PR fortran/57912 * trans-expr.c (gfc_trans_scalar_assign): Correct if condition for caf realloc. From-SVN: r200987 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ef0da9a29e0f..0013101a544d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2013-07-16 Tobias Burnus + + PR fortran/57912 + * trans-expr.c (gfc_trans_scalar_assign): Correct if + condition for caf realloc. + 2013-07-15 Tobias Burnus * trans-array.h (gfc_deallocate_alloc_comp_no_caf, diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index e1ed9d95b430..de1e51b2aa69 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6857,9 +6857,8 @@ gfc_trans_scalar_assign (gfc_se * lse, gfc_se * rse, gfc_typespec ts, fold_convert (TREE_TYPE (lse->expr), rse->expr)); /* Restore pointer address of coarray components. */ - if (ts.u.derived->attr.coarray_comp && deep_copy) + if (ts.u.derived->attr.coarray_comp && deep_copy && tmp_var != NULL_TREE) { - gcc_assert (tmp_var != NULL_TREE); tmp = gfc_reassign_alloc_comp_caf (ts.u.derived, tmp_var, lse->expr); tmp = build3_v (COND_EXPR, cond, build_empty_stmt (input_location), tmp);