From 99e2796b5c6ec4d6fff1b5aa0ba1fd9d19a1f1a2 Mon Sep 17 00:00:00 2001 From: Bill Schmidt Date: Thu, 29 Sep 2011 14:06:31 +0000 Subject: [PATCH] graphite-scop-detection.c (make_close_phi_nodes_unique): New forward declaration. 2011-09-29 Bill Schmidt * graphite-scop-detection.c (make_close_phi_nodes_unique): New forward declaration. (remove_duplicate_close_phi): Detect and repair creation of duplicate close-phis for a containing loop. From-SVN: r179351 --- gcc/ChangeLog | 7 +++++++ gcc/graphite-scop-detection.c | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 465ce0d03b0..71f9b59a2a7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-09-29 Bill Schmidt + + * graphite-scop-detection.c (make_close_phi_nodes_unique): New + forward declaration. + (remove_duplicate_close_phi): Detect and repair creation of + duplicate close-phis for a containing loop. + 2011-09-27 Andi Kleen * gcc.c (get_local_tick). Rename to get_random_number. diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index 346056899d3..e8370ef4e5a 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -36,6 +36,9 @@ along with GCC; see the file COPYING3. If not see #include "graphite-poly.h" #include "graphite-scop-detection.h" +/* Forward declarations. */ +static void make_close_phi_nodes_unique (basic_block); + /* The type of the analyzed basic block. */ typedef enum gbb_type { @@ -1231,6 +1234,13 @@ remove_duplicate_close_phi (gimple phi, gimple_stmt_iterator *gsi) SET_USE (use_p, res); update_stmt (use_stmt); + + /* It is possible that we just created a duplicate close-phi + for an already-processed containing loop. Check for this + case and clean it up. */ + if (gimple_code (use_stmt) == GIMPLE_PHI + && gimple_phi_num_args (use_stmt) == 1) + make_close_phi_nodes_unique (gimple_bb (use_stmt)); } remove_phi_node (gsi, true); -- 2.30.2