aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-vect-loop-manip.c
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2016-01-28 09:10:30 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2016-01-28 09:10:30 +0000
commit14ba8d6d0786acbda30f802dd6bc4d07f4df2e5f (patch)
treea37a1ca3bba1f4fc5d479113637a1a45821b6cf0 /gcc/tree-vect-loop-manip.c
parentc132770ebfe92cfab34a79811022437dae051c3b (diff)
downloadgcc-14ba8d6d0786acbda30f802dd6bc4d07f4df2e5f.zip
gcc-14ba8d6d0786acbda30f802dd6bc4d07f4df2e5f.tar.gz
gcc-14ba8d6d0786acbda30f802dd6bc4d07f4df2e5f.tar.bz2
re PR tree-optimization/69466 (ICE: Invalid PHI argument after vectorization (on -O2))
2016-01-28 Richard Biener <rguenther@suse.de> PR tree-optimization/69466 * tree-vect-loop-manip.c (slpeel_duplicate_current_defs_from_edges): Account for PHIs we couldn't duplicate. * gfortran.dg/vect/pr69466.f90: New testcase. From-SVN: r232916
Diffstat (limited to 'gcc/tree-vect-loop-manip.c')
-rw-r--r--gcc/tree-vect-loop-manip.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index f9fdf01..f8a44b5 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -727,17 +727,26 @@ slpeel_duplicate_current_defs_from_edges (edge from, edge to)
for (gsi_from = gsi_start_phis (from->dest),
gsi_to = gsi_start_phis (to->dest);
- !gsi_end_p (gsi_from) && !gsi_end_p (gsi_to);
- gsi_next (&gsi_from), gsi_next (&gsi_to))
+ !gsi_end_p (gsi_from) && !gsi_end_p (gsi_to);)
{
gimple *from_phi = gsi_stmt (gsi_from);
gimple *to_phi = gsi_stmt (gsi_to);
tree from_arg = PHI_ARG_DEF_FROM_EDGE (from_phi, from);
+ if (TREE_CODE (from_arg) != SSA_NAME)
+ {
+ gsi_next (&gsi_from);
+ continue;
+ }
tree to_arg = PHI_ARG_DEF_FROM_EDGE (to_phi, to);
- if (TREE_CODE (from_arg) == SSA_NAME
- && TREE_CODE (to_arg) == SSA_NAME
- && get_current_def (to_arg) == NULL_TREE)
+ if (TREE_CODE (to_arg) != SSA_NAME)
+ {
+ gsi_next (&gsi_to);
+ continue;
+ }
+ if (get_current_def (to_arg) == NULL_TREE)
set_current_def (to_arg, get_current_def (from_arg));
+ gsi_next (&gsi_from);
+ gsi_next (&gsi_to);
}
}