ipa-inline.c (can_inline_edge_p): Back out overzealous check on flag_non_call_exceptions compatibility.

* ipa-inline.c (can_inline_edge_p): Back out overzealous check on
	flag_non_call_exceptions compatibility.

From-SVN: r232722
This commit is contained in:
Eric Botcazou 2016-01-22 11:06:06 +00:00 committed by Eric Botcazou
parent 4696899f42
commit 6a96e91782
2 changed files with 7 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2016-01-22 Eric Botcazou <ebotcazou@adacore.com>
* ipa-inline.c (can_inline_edge_p): Back out overzealous check on
flag_non_call_exceptions compatibility.
2016-01-22 Jakub Jelinek <jakub@redhat.com>
PR debug/66668

View File

@ -431,12 +431,8 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
brought into a non-EH function unless we know that the callee
does not throw.
This is tracked by DECL_FUNCTION_PERSONALITY. */
|| (check_match (flag_non_call_exceptions)
/* TODO: We also may allow bringing !flag_non_call_exceptions
to flag_non_call_exceptions function, but that may need
extra work in tree-inline to add the extra EH edges. */
&& (!opt_for_fn (callee->decl, flag_non_call_exceptions)
|| DECL_FUNCTION_PERSONALITY (callee->decl)))
|| (check_maybe_up (flag_non_call_exceptions)
&& DECL_FUNCTION_PERSONALITY (callee->decl))
|| (check_maybe_up (flag_exceptions)
&& DECL_FUNCTION_PERSONALITY (callee->decl))
/* Strictly speaking only when the callee contains function