tree-optimization/93953 - avoid reference into hash-map

When possibly expanding a hash-map avoid keeping a reference to an
entry.

2020-02-27  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/93953
	* tree-vect-slp.c (slp_copy_subtree): Avoid keeping a reference
	to the hash-map entry.

	* gcc.dg/pr93953.c: New testcase.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b17d255ac8a1389f0906c87b5c6af46a6f42fa32..97419847b6250d955b45f8496780838a543e6b16 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-27  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/93953
+       * tree-vect-slp.c (slp_copy_subtree): Avoid keeping a reference
+       to the hash-map entry.
+
 2020-02-27  Andrew Stubbs  <ams@codesourcery.com>
 
        * config/gcn/gcn.md (mov<mode>): Add transformations for BI subregs.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cc13f91949f4f6bfc53af7674789c8fb9d81d27..fa18a159687874a977bdd4c1510bdd7be4f9da1c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-27  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/93953
+       * gcc.dg/pr93953.c: New testcase.
+
 2020-02-27  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/93949

diff --git a/gcc/testsuite/gcc.dg/pr93953.c b/gcc/testsuite/gcc.dg/pr93953.c
new file mode 100644 (file)
index 0000000..bf85c14
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr93953.c
@@ -0,0 +1,17 @@
+/* PR tree-optimization/93953 */
+/* { dg-do compile } */
+/* { dg-options "-O3 --param=ggc-min-expand=0 --param=ggc-min-heapsize=0" } */
+
+int *b, c, e;
+float d, g, f;
+
+void
+foo (int l)
+{
+  for (; l; ++l)
+    {
+      float a = g > l;
+      d += a * b[4 * (l + c * e)];
+      f += a * b[4 * (l + c * e) + 1];
+    }
+}

diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index c7ddd94b39f0b6fa83a75c67327293f84511a22c..9d17e3386fa1d5e9f30fab67a4ad54b60eb92dbd 100644 (file)
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -1764,11 +1764,12 @@ slp_copy_subtree (slp_tree node, hash_map<slp_tree, slp_tree> &map)
   unsigned i;
 
   bool existed_p;
-  slp_tree &copy = map.get_or_insert (node, &existed_p);
+  slp_tree &copy_ref = map.get_or_insert (node, &existed_p);
   if (existed_p)
-    return copy;
+    return copy_ref;
 
-  copy = XNEW (_slp_tree);
+  copy_ref = XNEW (_slp_tree);
+  slp_tree copy = copy_ref;
   memcpy (copy, node, sizeof (_slp_tree));
   if (SLP_TREE_SCALAR_STMTS (node).exists ())
     {