diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2019-10-28 09:19:56 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2019-10-28 08:19:56 +0000 |
| commit | 5a0236f8ca9d239bb62ef54c9273e6ca3f068f87 (patch) | |
| tree | 5910753b032daa5ccc64774b42e60c1f7a3c3713 /gcc | |
| parent | ffbdd78a4a84d80a5303d4f7a20553cf96954db9 (diff) | |
| download | gcc-5a0236f8ca9d239bb62ef54c9273e6ca3f068f87.zip gcc-5a0236f8ca9d239bb62ef54c9273e6ca3f068f87.tar.gz gcc-5a0236f8ca9d239bb62ef54c9273e6ca3f068f87.tar.bz2 | |
re PR ipa/92242 (LTO ICE in ipa_get_cs_argument_count ipa-prop.h:598)
PR ipa/92242
* ipa-fnsummary.c (ipa_merge_fn_summary_after_inlining): Check
for missing EDGE_REF
* ipa-prop.c (update_jump_functions_after_inlining): Likewise.
From-SVN: r277504
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ipa-fnsummary.c | 2 | ||||
| -rw-r--r-- | gcc/ipa-prop.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9511081..9ef181f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-10-25 Jan Hubicka <hubicka@ucw.cz> + + PR ipa/92242 + * ipa-fnsummary.c (ipa_merge_fn_summary_after_inlining): Check + for missing EDGE_REF + * ipa-prop.c (update_jump_functions_after_inlining): Likewise. + 2019-10-25 Jiufu Guo <guojiufu@linux.ibm.com> PR tree-optimization/88760 diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c index ce384df..0d38e42 100644 --- a/gcc/ipa-fnsummary.c +++ b/gcc/ipa-fnsummary.c @@ -3315,7 +3315,7 @@ ipa_merge_fn_summary_after_inlining (struct cgraph_edge *edge) if (ipa_node_params_sum && callee_info->conds) { class ipa_edge_args *args = IPA_EDGE_REF (edge); - int count = ipa_get_cs_argument_count (args); + int count = args ? ipa_get_cs_argument_count (args) : 0; int i; if (count) diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index edab920..0dd73561 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2741,7 +2741,7 @@ update_jump_functions_after_inlining (struct cgraph_edge *cs, /* We must check range due to calls with variable number of arguments and we cannot combine jump functions with operations. */ if (dst->value.pass_through.operation == NOP_EXPR - && (dst->value.pass_through.formal_id + && (top && dst->value.pass_through.formal_id < ipa_get_cs_argument_count (top))) { int dst_fid = dst->value.pass_through.formal_id; @@ -3430,7 +3430,7 @@ update_indirect_edges_after_inlining (struct cgraph_edge *cs, continue; /* We must check range due to calls with variable number of arguments: */ - if (ici->param_index >= ipa_get_cs_argument_count (top)) + if (!top || ici->param_index >= ipa_get_cs_argument_count (top)) { ici->param_index = -1; continue; |