IPA: Avoid segfault in devirtualization_time_bonus (PR 93223)

2020-01-14  Martin Jambor  <mjambor@suse.cz>

	PR ipa/93223
	* ipa-cp.c (devirtualization_time_bonus): Check whether isummary is
	NULL.

	testsuite/
	* g++.dg/ipa/pr93223.C: New test.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 614fdc1cab9e5c7d0c9d1a99c13cdff64a3233fd..861a806f8fe8dc348a306840dd9481a4e5422e3c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2020-01-14  Martin Jambor  <mjambor@suse.cz>
+
+       Backport from mainline
+       2020-01-13  Martin Jambor  <mjambor@suse.cz>
+
+       PR ipa/93223
+       * ipa-cp.c (devirtualization_time_bonus): Check whether isummary is
+       NULL.
+
 2020-01-10  Martin Jambor  <mjambor@suse.cz>
 
        Backport from mainline

diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 36ec54d77534e1c8b5929beb3c06f9f46d795877..9840394010054469dd382c850a88c772f13934e1 100644 (file)
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -2567,7 +2567,7 @@ devirtualization_time_bonus (struct cgraph_node *node,
       if (avail < AVAIL_AVAILABLE)
        continue;
       isummary = ipa_fn_summaries->get (callee);
-      if (!isummary->inlinable)
+      if (!isummary || !isummary->inlinable)
        continue;
 
       /* FIXME: The values below need re-considering and perhaps also

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f5c1c2040da49de64deb8bb95bd1329bc052d609..12d7839b858f7f1c7bf7477bd4a6426c074f4dbc 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-14  Martin Jambor  <mjambor@suse.cz>
+
+       Backport from mainline
+       2020-01-13  Martin Jambor  <mjambor@suse.cz>
+
+       PR ipa/93223
+       * g++.dg/ipa/pr93223.C: New test.
+
 2020-01-13  Joseph Myers  <joseph@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/g++.dg/ipa/pr93223.C b/gcc/testsuite/g++.dg/ipa/pr93223.C
new file mode 100644 (file)
index 0000000..87f98b5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr93223.C
@@ -0,0 +1,62 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -std=gnu++14" } */
+
+template <typename Function>
+bool run(const int item_count,
+         Function && process_range,
+         const int max_parallelism,
+         int* progress = nullptr)
+{
+    if (max_parallelism <= 1)
+    {
+        if (progress == nullptr)
+        {
+            return process_range(0);
+        }
+        else
+        {
+            auto result = true;
+            for (int i = 0; i != item_count && result; ++i)
+            {
+                (*progress)++;
+                result = process_range(i);
+            }
+            return result;
+        }
+    }
+
+    if (max_parallelism > 10)
+    {
+        if (progress == nullptr)
+        {
+            return process_range(0);
+        }
+        else
+        {
+            auto result = true;
+            for (int i = 0; i != item_count && result; ++i)
+            {
+                (*progress)++;
+                result = process_range(i);
+            }
+            return result;
+        }
+    }
+    return false;
+}
+
+namespace
+{
+__attribute__((optimize(0))) bool worker_fun(const int)
+{
+    return true;
+}
+}
+
+void demo(int n)
+{
+    for (int i = 0; i < n; ++i)
+    {
+        run(n, &worker_fun, n);
+    }
+}