From d370518679f55fa676afe6010301945b9ccc7053 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Tue, 13 Dec 2011 17:08:14 +0100 Subject: [PATCH] re PR middle-end/50628 (gfortran.fortran-torture/execute/entry_4.f90 fails) 2011-12-13 Martin Jambor PR middle-end/50628 * tree-sra.c (propagate_subaccesses_across_link): Do not propagate sub-accesses of scalar accesses. From-SVN: r182289 --- gcc/ChangeLog | 6 ++++++ gcc/tree-sra.c | 28 +++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3b28a5d10fc..a9022e0b7b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-12-13 Martin Jambor + + PR middle-end/50628 + * tree-sra.c (propagate_subaccesses_across_link): Do not propagate + sub-accesses of scalar accesses. + 2011-12-13 Martin Jambor PR tree-optimization/51362 diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index b921c763773..84cbc846214 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -2266,21 +2266,23 @@ propagate_subaccesses_across_link (struct access *lacc, struct access *racc) || racc->grp_unscalarizable_region) return false; - if (!lacc->first_child && !racc->first_child - && is_gimple_reg_type (racc->type)) + if (is_gimple_reg_type (racc->type)) { - tree t = lacc->base; - - lacc->type = racc->type; - if (build_user_friendly_ref_for_offset (&t, TREE_TYPE (t), lacc->offset, - racc->type)) - lacc->expr = t; - else + if (!lacc->first_child && !racc->first_child) { - lacc->expr = build_ref_for_model (EXPR_LOCATION (lacc->base), - lacc->base, lacc->offset, - racc, NULL, false); - lacc->grp_no_warning = true; + tree t = lacc->base; + + lacc->type = racc->type; + if (build_user_friendly_ref_for_offset (&t, TREE_TYPE (t), + lacc->offset, racc->type)) + lacc->expr = t; + else + { + lacc->expr = build_ref_for_model (EXPR_LOCATION (lacc->base), + lacc->base, lacc->offset, + racc, NULL, false); + lacc->grp_no_warning = true; + } } return false; } -- 2.30.2