From 1b31fca70f9f410f389363c17d85533d9bb2178a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 6 Mar 2017 12:48:54 +0000 Subject: [PATCH] re PR fortran/79894 (ICE in gfc_add_modify_loc, at fortran/trans.c:159) 2017-03-06 Richard Biener PR fortran/79894 * trans.c (gfc_add_modify_loc): Weaken assert. From-SVN: r245919 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8640646127c..5c99ca70f48 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2017-03-06 Richard Biener + + PR fortran/79894 + * trans.c (gfc_add_modify_loc): Weaken assert. + 2017-03-05 Andre Vehreschild , Alessandro Fanfarillo diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index e25ccaa258a..2323e0abe3d 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -151,11 +151,11 @@ gfc_add_modify_loc (location_t loc, stmtblock_t * pblock, tree lhs, tree rhs) tree t1, t2; t1 = TREE_TYPE (rhs); t2 = TREE_TYPE (lhs); - /* Make sure that the types of the rhs and the lhs are the same + /* Make sure that the types of the rhs and the lhs are compatible for scalar assignments. We should probably have something similar for aggregates, but right now removing that check just breaks everything. */ - gcc_checking_assert (t1 == t2 + gcc_checking_assert (TYPE_MAIN_VARIANT (t1) == TYPE_MAIN_VARIANT (t2) || AGGREGATE_TYPE_P (TREE_TYPE (lhs))); tmp = fold_build2_loc (loc, MODIFY_EXPR, void_type_node, lhs, -- 2.30.2