diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2016-01-22 11:06:06 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2016-01-22 11:06:06 +0000 |
| commit | 6a96e91782a30fe8d59286243b4573c2e957f1fa (patch) | |
| tree | 6c71164c851ff89dc2e1cb7962505d2b033565a7 /gcc/ipa-inline.c | |
| parent | 4696899f42bb40f21b99879542be04ce65cc0b33 (diff) | |
| download | gcc-6a96e91782a30fe8d59286243b4573c2e957f1fa.zip gcc-6a96e91782a30fe8d59286243b4573c2e957f1fa.tar.gz gcc-6a96e91782a30fe8d59286243b4573c2e957f1fa.tar.bz2 | |
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
Diffstat (limited to 'gcc/ipa-inline.c')
| -rw-r--r-- | gcc/ipa-inline.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index aed8882..07e661e 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -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 |