From d3fb5cf063a3f9d664d8b863070a1b7cabebba13 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Tue, 3 Jun 2014 12:09:20 +0200 Subject: [PATCH] re PR ipa/61160 (wrong code with -O3 (or ICE: verify_cgraph_node failed: edge points to wrong declaration)) 2014-06-03 Martin Jambor PR ipa/61160 * ipa-cp.c (cgraph_edge_brings_value_p): Handle edges leading to thunks. testsuite/ * g++.dg/ipa/pr61160-1.C: New test. From-SVN: r211170 --- gcc/ChangeLog | 6 ++++++ gcc/ipa-cp.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ipa/pr61160-1.C | 31 ++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ipa/pr61160-1.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 411e71048cc..9664949256c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-03 Martin Jambor + + PR ipa/61160 + * ipa-cp.c (cgraph_edge_brings_value_p): Handle edges leading to + thunks. + 2014-06-03 Thomas Preud'homme PR tree-optimization/61328 diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index 08fb73e0e93..33ff9b63f6c 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -2482,7 +2482,8 @@ cgraph_edge_brings_value_p (struct cgraph_edge *cs, struct ipcp_value_source *src) { struct ipa_node_params *caller_info = IPA_NODE_REF (cs->caller); - struct ipa_node_params *dst_info = IPA_NODE_REF (cs->callee); + cgraph_node *real_dest = cgraph_function_node (cs->callee); + struct ipa_node_params *dst_info = IPA_NODE_REF (real_dest); if ((dst_info->ipcp_orig_node && !dst_info->is_all_contexts_clone) || caller_info->node_dead) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9c0e9fb9632..14d79e1842f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-03 Martin Jambor + + PR ipa/61160 + * g++.dg/ipa/pr61160-1.C: New test. + 2014-06-03 Richard Biener PR tree-optimization/61383 diff --git a/gcc/testsuite/g++.dg/ipa/pr61160-1.C b/gcc/testsuite/g++.dg/ipa/pr61160-1.C new file mode 100644 index 00000000000..a0fbb5f42bd --- /dev/null +++ b/gcc/testsuite/g++.dg/ipa/pr61160-1.C @@ -0,0 +1,31 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +struct CBase { + virtual void BaseFunc () {} +}; + +struct MMixin { + virtual void * MixinFunc (int, void *) = 0; +}; + +struct CExample: CBase, public MMixin +{ + void *MixinFunc (int arg, void *arg2) + { + if (arg != 1 || arg2) + return 0; + return this; + } +}; + +void *test (MMixin & anExample) +{ + return anExample.MixinFunc (1, 0); +} + +int main () +{ + CExample c; + return (test (c) != &c); +}