From: Jan Hubicka <hubicka@ucw.cz>
To: gcc-patches@gcc.gnu.org
Subject: Fix ipa-inline-transform ICE
Date: Sun, 18 Jan 2015 17:51:00 -0000 [thread overview]
Message-ID: <20150118174341.GA17433@kam.mff.cuni.cz> (raw)
Hi,
the testcase shows a case where try_make_edge_direct_virtual_call disagrees with
ipa_get_indirect_edge_target_1 making ipa-inline-transform to ICE on mismatch.
Bootstrapped/regtested x86_64-linux, comitted.
Honza
Index: ChangeLog
===================================================================
--- ChangeLog (revision 219821)
+++ ChangeLog (working copy)
@@ -1,3 +1,10 @@
+2015-01-18 Jan Hubicka <hubicka@ucw.cz>
+
+ PR ipa/64378
+ * ipa-prop.c (try_make_edge_direct_virtual_call): Clear speculative
+ flag correctly.
+ * ipa-cp.c (ipa_get_indirect_edge_target_1): Handle speculation.
+
2015-01-18 Sandra Loosemore <sandra@codesourcery.com>
* doc/invoke.texi ([-funroll-loops], [-funroll-all-loops]):
Index: testsuite/ChangeLog
===================================================================
--- testsuite/ChangeLog (revision 219821)
+++ testsuite/ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2015-01-18 Jan Hubicka <hubicka@ucw.cz>
+
+ PR ipa/64378
+ * g++.dg/torture/pr64378.C: New testcase.
+
2015-01-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/57959
Index: testsuite/g++.dg/torture/pr64378.C
===================================================================
--- testsuite/g++.dg/torture/pr64378.C (revision 0)
+++ testsuite/g++.dg/torture/pr64378.C (revision 0)
@@ -0,0 +1,24 @@
+// { dg-do compile }
+// { dg-options "-fno-ipa-cp" }
+struct data {
+ data(int) {}
+};
+
+struct top {
+ virtual int topf() {}
+};
+
+struct child1: top {
+ void childf()
+ {
+ data d(topf());
+ }
+};
+
+void test(top *t)
+{
+ child1 *c = static_cast<child1 *>(t);
+ c->childf();
+ child1 d;
+ test(&d);
+}
Index: ipa-prop.c
===================================================================
--- ipa-prop.c (revision 219821)
+++ ipa-prop.c (working copy)
@@ -2985,7 +2985,7 @@ try_make_edge_direct_virtual_call (struc
|| !possible_polymorphic_call_target_p
(ie, cgraph_node::get (t)))
{
- /* Do not speculate builtin_unreachable, it is stpid! */
+ /* Do not speculate builtin_unreachable, it is stupid! */
if (!ie->indirect_info->vptr_changed)
target = ipa_impossible_devirt_target (ie, target);
}
@@ -3013,6 +3013,7 @@ try_make_edge_direct_virtual_call (struc
ctx, &final);
if (final && targets.length () <= 1)
{
+ speculative = false;
if (targets.length () == 1)
target = targets[0]->decl;
else
Index: ipa-cp.c
===================================================================
--- ipa-cp.c (revision 219821)
+++ ipa-cp.c (working copy)
@@ -1975,8 +1975,13 @@ ipa_get_indirect_edge_target_1 (struct c
}
}
else if (t)
- context = ipa_polymorphic_call_context (t, ie->indirect_info->otr_type,
- anc_offset);
+ {
+ context = ipa_polymorphic_call_context (t, ie->indirect_info->otr_type,
+ anc_offset);
+ if (ie->indirect_info->vptr_changed)
+ context.possible_dynamic_type_change (ie->in_polymorphic_cdtor,
+ ie->indirect_info->otr_type);
+ }
else
return NULL_TREE;
next reply other threads:[~2015-01-18 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-18 17:51 Jan Hubicka [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-12-19 10:32 Jan Hubicka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150118174341.GA17433@kam.mff.cuni.cz \
--to=hubicka@ucw.cz \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).