Fix (PR middle-end/79931)

2017-04-24  Jan Hubicka  <hubicka@ucw.cz>

	PR middle-end/79931
	* ipa-devirt.c (dump_possible_polymorphic_call_targets): Fix ICE.
2017-04-24  Martin Liska  <mliska@suse.cz>

	PR middle-end/79931
	* g++.dg/ipa/pr79931.C: New test.

From-SVN: r247097

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a6f0006f935b4c9590f418faaa3ea3e696c5b4f..487e8b0189b51832f2c3d8db0ba4d1106d6e1c33 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24  Jan Hubicka  <hubicka@ucw.cz>
+
+       PR middle-end/79931
+       * ipa-devirt.c (dump_possible_polymorphic_call_targets): Fix ICE.
+
 2017-04-24  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/80494

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 0c74c87a04b11858e889e1f855c0d4c9e16a63de..e013a26a4a0d20c386b950921965aa0b7f0c6828 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -3367,7 +3367,13 @@ dump_possible_polymorphic_call_targets (FILE *f,
       fprintf (f, "  Speculative targets:");
       dump_targets (f, targets);
     }
-  gcc_assert (targets.length () <= len);
+  /* Ugly: during callgraph construction the target cache may get populated
+     before all targets are found.  While this is harmless (because all local
+     types are discovered and only in those case we devirtualize fully and we
+     don't do speculative devirtualization before IPA stage) it triggers
+     assert here when dumping at that stage also populates the case with
+     speculative targets.  Quietly ignore this.  */
+  gcc_assert (symtab->state < IPA_SSA || targets.length () <= len);
   fprintf (f, "\n");
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 740de777e1cb8c4131cd78d28e2bf2b35424f1e1..8032d96ed8f65e096a35e78a24b0f8de2dfc53e6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24  Martin Liska  <mliska@suse.cz>
+
+       PR middle-end/79931
+       * g++.dg/ipa/pr79931.C: New test.
+
 2017-04-24  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/80494

diff --git a/gcc/testsuite/g++.dg/ipa/pr79931.C b/gcc/testsuite/g++.dg/ipa/pr79931.C
new file mode 100644 (file)
index 0000000..78f6e03
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr79931.C
@@ -0,0 +1,24 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-ipa-all" } */
+
+class DocumentImpl;
+struct NodeImpl
+{
+  virtual DocumentImpl * getOwnerDocument();
+  virtual NodeImpl * getParentNode();
+  virtual NodeImpl * removeChild(NodeImpl *oldChild);
+};
+struct AttrImpl : NodeImpl
+{
+  NodeImpl *insertBefore(NodeImpl *newChild, NodeImpl *refChild);
+};
+struct DocumentImpl : NodeImpl
+{
+  virtual NodeImpl *removeChild(NodeImpl *oldChild);
+  virtual int* getRanges();
+};
+NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
+  NodeImpl *oldparent = newChild->getParentNode();
+  oldparent->removeChild(newChild);
+  this->getOwnerDocument()->getRanges();
+}