fix vectorizer memleaks

This plugs two memleaks in the vectorizer.

2021-01-08  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (scalar_stmts_to_slp_tree_map_t): Fix.
	(vect_build_slp_tree): On cache hit release the matched
	scalar stmts vector.
	* tree-vect-stmts.c (vectorizable_store): Properly free
	vec_oprnds before possibly gathering them again.

diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index e0f3539aa54e8a5165acdb75fd222bae628d3f33..e7191ed3267378638e45ddb02b88af0c50ecb116 100644 (file)
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -1378,7 +1378,7 @@ bst_traits::equal (value_type existing, value_type candidate)
   return true;
 }
 
-typedef hash_map <vec <gimple *>, slp_tree,
+typedef hash_map <vec <stmt_vec_info>, slp_tree,
                  simple_hashmap_traits <bst_traits, slp_tree> >
   scalar_stmts_to_slp_tree_map_t;
 
@@ -1405,6 +1405,7 @@ vect_build_slp_tree (vec_info *vinfo,
        {
          SLP_TREE_REF_COUNT (*leader)++;
          vect_update_max_nunits (max_nunits, (*leader)->max_nunits);
+         stmts.release ();
        }
       return *leader;
     }

diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 014f1aff4c1bbda55c431635f72e0382ff77401e..068e49823035f9223cada9e4162e777aa56d1f2e 100644 (file)
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -7717,11 +7717,11 @@ vectorizable_store (vec_info *vinfo,
                }
            }
          next_stmt_info = DR_GROUP_NEXT_ELEMENT (next_stmt_info);
+         vec_oprnds.release ();
          if (slp)
            break;
        }
 
-      vec_oprnds.release ();
       return true;
     }