re PR tree-optimization/80113 (ICE in set_var_live_on_entry at tree-ssa-live.c:1018)

2017-03-20  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/80113
	* graphite-isl-ast-to-gimple.c (copy_loop_phi_nodes): Do not
	allocate extra SSA name for PHI def.
	(add_close_phis_to_outer_loops): Likewise.
	(add_close_phis_to_merge_points): Likewise.
	(copy_loop_close_phi_args): Likewise.
	(copy_cond_phi_nodes): Likewise.

From-SVN: r246277

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5024c0f..f8b56a2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2017-03-20  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/80113
+       * graphite-isl-ast-to-gimple.c (copy_loop_phi_nodes): Do not
+       allocate extra SSA name for PHI def.
+       (add_close_phis_to_outer_loops): Likewise.
+       (add_close_phis_to_merge_points): Likewise.
+       (copy_loop_close_phi_args): Likewise.
+       (copy_cond_phi_nodes): Likewise.
+
 2017-03-20  Martin Liska  <mliska@suse.cz>
 
        PR middle-end/79753

diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index ec5fb73..3f082da 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -1891,7 +1891,7 @@ copy_loop_phi_nodes (basic_block bb, basic_block new_bb)
       if (is_gimple_reg (res) && scev_analyzable_p (res, region->region))
        continue;
 
-      gphi *new_phi = create_phi_node (SSA_NAME_VAR (res), new_bb);
+      gphi *new_phi = create_phi_node (NULL_TREE, new_bb);
       tree new_res = create_new_def_for (res, new_phi,
                                         gimple_phi_result_ptr (new_phi));
       set_rename (res, new_res);
@@ -1991,7 +1991,7 @@ add_close_phis_to_outer_loops (tree last_merge_name, edge last_e,
   if (!bb_contains_loop_close_phi_nodes (bb) || !single_succ_p (bb))
     bb = split_edge (e);
 
-  gphi *close_phi = create_phi_node (SSA_NAME_VAR (last_merge_name), bb);
+  gphi *close_phi = create_phi_node (NULL_TREE, bb);
   tree res = create_new_def_for (last_merge_name, close_phi,
                                 gimple_phi_result_ptr (close_phi));
   set_rename (old_close_phi_name, res);
@@ -2036,7 +2036,7 @@ add_close_phis_to_merge_points (gphi *old_close_phi, gphi *new_close_phi,
       last_merge_name = add_close_phis_to_outer_loops (last_merge_name, merge_e,
                                                       old_close_phi);
 
-      gphi *merge_phi = create_phi_node (SSA_NAME_VAR (old_close_phi_name), new_merge_bb);
+      gphi *merge_phi = create_phi_node (NULL_TREE, new_merge_bb);
       tree merge_res = create_new_def_for (old_close_phi_name, merge_phi,
                                           gimple_phi_result_ptr (merge_phi));
       set_rename (old_close_phi_name, merge_res);
@@ -2089,7 +2089,7 @@ copy_loop_close_phi_args (basic_block old_bb, basic_block new_bb, bool postpone)
        /* Loop close phi nodes should not be scev_analyzable_p.  */
        gcc_unreachable ();
 
-      gphi *new_close_phi = create_phi_node (SSA_NAME_VAR (res), new_bb);
+      gphi *new_close_phi = create_phi_node (NULL_TREE, new_bb);
       tree new_res = create_new_def_for (res, new_close_phi,
                                         gimple_phi_result_ptr (new_close_phi));
       set_rename (res, new_res);
@@ -2472,7 +2472,7 @@ copy_cond_phi_nodes (basic_block bb, basic_block new_bb, vec<tree> iv_map)
       if (virtual_operand_p (res))
        continue;
 
-      gphi *new_phi = create_phi_node (SSA_NAME_VAR (res), new_bb);
+      gphi *new_phi = create_phi_node (NULL_TREE, new_bb);
       tree new_res = create_new_def_for (res, new_phi,
                                         gimple_phi_result_ptr (new_phi));
       set_rename (res, new_res);