diff options
| author | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-03 10:13:15 +0000 |
|---|---|---|
| committer | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-03 10:13:15 +0000 |
| commit | 755fc5cfa29a62df1d7861af79771ff4e26d3170 (patch) | |
| tree | bd2e5e1105ff3e14aa42704b33b4ef47fbfbdd0a | |
| parent | a0731edee1c21135c1275b8224613bf3245a5fdb (diff) | |
| download | ppe42-gcc-755fc5cfa29a62df1d7861af79771ff4e26d3170.tar.gz ppe42-gcc-755fc5cfa29a62df1d7861af79771ff4e26d3170.zip | |
2014-06-03 Martin Jambor <mjambor@suse.cz>
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@211171 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-cp.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ipa/pr61160-1.C | 31 |
4 files changed, 44 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index beccd82ecbf..30ac5ba8973 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-03 Martin Jambor <mjambor@suse.cz> + + PR ipa/61160 + * ipa-cp.c (cgraph_edge_brings_value_p): Handle edges leading to + thunks. + 2014-06-03 Andrey Belevantsev <abel@ispras.ru> Backport from mainline diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index 689378a736f..7fb7ae63a8a 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 5c7333382b1..351699e5fc7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-03 Martin Jambor <mjambor@suse.cz> + + PR ipa/61160 + * g++.dg/ipa/pr61160-1.C: New test. + 2014-06-03 Andrey Belevantsev <abel@ispras.ru> Backport from mainline 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); +} |
