From 0f6e9b2946bfde1086263f4457ef9f11b0edded3 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 20 Nov 2019 21:15:54 +0000 Subject: [PATCH] Restore stmt def types after scheduling two-operation SLP 2019-11-20 Richard Sandiford gcc/ * tree-vect-slp.c (vect_schedule_slp_instance): Restore stmt def types for two-operation SLP. From-SVN: r278533 --- gcc/ChangeLog | 5 +++++ gcc/tree-vect-slp.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3ddaa8a059d..cf06e3aad08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-20 Richard Sandiford + + * tree-vect-slp.c (vect_schedule_slp_instance): Restore stmt + def types for two-operation SLP. + 2019-11-20 Richard Sandiford PR testsuite/92366 diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 36ea0b1dffb..dfbde1a3c77 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -4153,6 +4153,7 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance) /* Handle two-operation SLP nodes by vectorizing the group with both operations and then performing a merge. */ + bool done_p = false; if (SLP_TREE_TWO_OPERATORS (node)) { gassign *stmt = as_a (stmt_info->stmt); @@ -4223,10 +4224,11 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance) } v0.release (); v1.release (); - return; + done_p = true; } } - vect_transform_stmt (stmt_info, &si, node, instance); + if (!done_p) + vect_transform_stmt (stmt_info, &si, node, instance); /* Restore stmt def-types. */ FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child) -- 2.30.2