diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-prop.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 |
3 files changed, 18 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 90254ff..fa938d8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2015-07-16 Martin Liska <mliska@suse.cz> + PR ipa/66896. + * ipa-prop.c (update_jump_functions_after_inlining): Create properly + dst_ctx if it does not exist. + +2015-07-16 Martin Liska <mliska@suse.cz> + * hash-set.h (remove): New function. (iterator): New iteration class for hash_set. diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index aa659b7..c862cff 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2377,11 +2377,15 @@ update_jump_functions_after_inlining (struct cgraph_edge *cs, ctx.offset_by (dst->value.ancestor.offset); if (!ctx.useless_p ()) { - vec_safe_grow_cleared (args->polymorphic_call_contexts, - count); - dst_ctx = ipa_get_ith_polymorhic_call_context (args, i); + if (!dst_ctx) + { + vec_safe_grow_cleared (args->polymorphic_call_contexts, + count); + dst_ctx = ipa_get_ith_polymorhic_call_context (args, i); + } + + dst_ctx->combine_with (ctx); } - dst_ctx->combine_with (ctx); } if (src->agg.items diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9bace80..aa807cc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-07-16 Martin Liska <mliska@suse.cz> + + * g++.dg/ipa/pr66896.c: New test. + 2015-07-16 Richard Biener <rguenther@suse.de> PR tree-optimization/66894 |