From 1f8ba82489f40b751fdb8c0c5a6f6208e888be4a Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Wed, 15 Jul 2015 21:37:07 +0000 Subject: [PATCH] One of the code refactorings introducing phi node iterators modified the semantics of this code. One of the code refactorings introducing phi node iterators modified the semantics of this code. Revert that change to what was before. * graphite-sese-to-poly.c (rewrite_cross_bb_scalar_deps): Point iterator to use_stmt. Co-Authored-By: Sebastian Pop From-SVN: r225851 --- gcc/ChangeLog | 6 ++++++ gcc/graphite-sese-to-poly.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82ef7ecddcc..9c1e3cf8219 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-15 Aditya Kumar + Sebastian Pop + + * graphite-sese-to-poly.c (rewrite_cross_bb_scalar_deps): Point + iterator to use_stmt. + 2015-07-15 Aditya Kumar Sebastian Pop diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index ffc948fd0b7..aaecab45e70 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2441,10 +2441,10 @@ rewrite_cross_bb_scalar_deps (scop_p scop, gimple_stmt_iterator *gsi) handle_scalar_deps_crossing_scop_limits (scop, def, stmt); FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) - if (gimple_code (use_stmt) == GIMPLE_PHI - && (res = true)) + if (gphi *phi = dyn_cast (use_stmt)) { - gphi_iterator psi = gsi_start_phis (gimple_bb (use_stmt)); + res = true; + gphi_iterator psi = gsi_for_phi (phi); if (scalar_close_phi_node_p (gsi_stmt (psi))) rewrite_close_phi_out_of_ssa (scop, &psi); -- 2.30.2