From 0370f12c36079259d344480d8f1fdcd80f7aa783 Mon Sep 17 00:00:00 2001 From: marxin Date: Mon, 24 Apr 2017 13:16:34 +0000 Subject: [PATCH] Fix (PR middle-end/79931) 2017-04-24 Jan Hubicka PR middle-end/79931 * ipa-devirt.c (dump_possible_polymorphic_call_targets): Fix ICE. 2017-04-24 Martin Liska PR middle-end/79931 * g++.dg/ipa/pr79931.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@247097 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/ipa-devirt.c | 8 +++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ipa/pr79931.C | 24 ++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ipa/pr79931.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1a6f0006f93..487e8b0189b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-04-24 Jan Hubicka + + PR middle-end/79931 + * ipa-devirt.c (dump_possible_polymorphic_call_targets): Fix ICE. + 2017-04-24 Richard Biener PR tree-optimization/80494 diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 0c74c87a04b..e013a26a4a0 100644 --- 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 740de777e1c..8032d96ed8f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-24 Martin Liska + + PR middle-end/79931 + * g++.dg/ipa/pr79931.C: New test. + 2017-04-24 Richard Biener 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 index 00000000000..78f6e03c458 --- /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(); +} -- 2.11.4.GIT