Do not ICE in IPA inliner.

2019-10-23  Martin Liska  <mliska@suse.cz>

	PR ipa/91969
	* ipa-inline.c (recursive_inlining): Do not print
	when curr->count is not initialized.
2019-10-23  Martin Liska  <mliska@suse.cz>

	PR ipa/91969
	* g++.dg/ipa/pr91969.C: New test.

From-SVN: r277309

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2445523f274fd5a4729861779d2fe62f2eab8ee0..85cd7a023c20d1e782a465b6c38d8d96f8db7ede 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-23  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/91969
+       * ipa-inline.c (recursive_inlining): Do not print
+       when curr->count is not initialized.
+
 2019-10-23  Richard Biener  <rguenther@suse.de>
 
        * tree-vect-slp.c (vect_build_slp_tree_2): Do not build

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 681801a9aec0cb4e9e920de0a5cb8501a9ce9f3f..ce146e0fc07bc6af5f57c98fc9750c326c4c94f7 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1610,7 +1610,7 @@ recursive_inlining (struct cgraph_edge *edge,
        {
          fprintf (dump_file,
                   "   Inlining call of depth %i", depth);
-         if (node->count.nonzero_p ())
+         if (node->count.nonzero_p () && curr->count.initialized_p ())
            {
              fprintf (dump_file, " called approx. %.2f times per call",
                       (double)curr->count.to_gcov_type ()

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd272807d0ba4f65c8975c7e16c320deff7632b5..482ff0ccabc9388a06f942dc7380a4262a2b87e2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-23  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/91969
+       * g++.dg/ipa/pr91969.C: New test.
+
 2019-10-22  Marc Glisse  <marc.glisse@inria.fr>
 
        PR c++/85746

diff --git a/gcc/testsuite/g++.dg/ipa/pr91969.C b/gcc/testsuite/g++.dg/ipa/pr91969.C
new file mode 100644 (file)
index 0000000..9000672
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr91969.C
@@ -0,0 +1,38 @@
+/* PR ipa/91969 */
+/* { dg-options "-fdump-ipa-inline -O3" } */
+
+enum by
+{
+};
+class A
+{
+public:
+  class B
+  {
+  public:
+    virtual void m_fn2 (by) = 0;
+  };
+  virtual int m_fn1 ();
+  B *cf;
+};
+by a;
+class C : A, A::B
+{
+  void m_fn2 (by);
+};
+void C::m_fn2 (by) { cf->m_fn2 (a); }
+
+struct a
+{
+  virtual ~a ();
+};
+
+struct b
+{
+  virtual void d (...);
+};
+
+struct c : a, b
+{
+  void d (...) {}
+};