From 8ce3fee51b0ede9b6033cd45d4ce6df56b5ec71a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 17 Nov 2016 08:42:50 +0000 Subject: [PATCH] =?utf8?q?re=20PR=20middle-end/78306=20([CilkPlus]=20"inli?= =?utf8?q?ning=20failed=20in=20call=20to=20always=5Finline=20=E2=80=98mems?= =?utf8?q?et=E2=80=99:=20function=20not=20inlinable"=20with=20-fcilkplus)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-11-17 Richard Biener PR tree-optimization/78306 * ipa-inline-analysis.c (initialize_inline_failed): Do not inhibit inlining if function calls cilk_spawn. (can_inline_edge_p): Likewise. * gcc.dg/cilk-plus/pr78306.c: New testcase. From-SVN: r242537 --- gcc/ChangeLog | 7 ++++++ gcc/ipa-inline-analysis.c | 3 --- gcc/ipa-inline.c | 5 ---- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.dg/cilk-plus/pr78306.c | 30 ++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/cilk-plus/pr78306.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b8e527aa59a..d70f88df81d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-11-17 Richard Biener + + PR tree-optimization/78306 + * ipa-inline-analysis.c (initialize_inline_failed): Do not + inhibit inlining if function calls cilk_spawn. + (can_inline_edge_p): Likewise. + 2016-11-17 Richard Biener PR middle-end/78305 diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index 8228e8ae3e8..1b5f805d2bc 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -1507,9 +1507,6 @@ initialize_inline_failed (struct cgraph_edge *e) e->inline_failed = CIF_BODY_NOT_AVAILABLE; else if (callee->local.redefined_extern_inline) e->inline_failed = CIF_REDEFINED_EXTERN_INLINE; - else if (cfun && fn_contains_cilk_spawn_p (cfun)) - /* We can't inline if the function is spawing a function. */ - e->inline_failed = CIF_CILK_SPAWN; else e->inline_failed = CIF_FUNCTION_NOT_CONSIDERED; gcc_checking_assert (!e->call_stmt_cannot_inline_p diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 82bb94fa1aa..5f2371c6b26 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -368,11 +368,6 @@ can_inline_edge_p (struct cgraph_edge *e, bool report, e->inline_failed = CIF_FUNCTION_NOT_INLINABLE; inlinable = false; } - else if (inline_summaries->get (caller)->contains_cilk_spawn) - { - e->inline_failed = CIF_CILK_SPAWN; - inlinable = false; - } /* Don't inline a function with mismatched sanitization attributes. */ else if (!sanitize_attrs_match_for_inline_p (caller->decl, callee->decl)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c142b4b013d..9545d9cce79 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-11-17 Richard Biener + + PR tree-optimization/78306 + * gcc.dg/cilk-plus/pr78306.c: New testcase. + 2016-11-17 Richard Biener PR middle-end/78305 diff --git a/gcc/testsuite/gcc.dg/cilk-plus/pr78306.c b/gcc/testsuite/gcc.dg/cilk-plus/pr78306.c new file mode 100644 index 00000000000..4604271441c --- /dev/null +++ b/gcc/testsuite/gcc.dg/cilk-plus/pr78306.c @@ -0,0 +1,30 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fcilkplus" } */ + +#define _FORTIFY_SOURCE 2 +#include + +int sum(int low, int high) +{ + if(low == high) { + return low; + } + + int mid = low + (high-low)/2; + int a = _Cilk_spawn sum(low, mid); + int b = sum(mid+1, high); + + // Some very expensive computation here + int foo[64]; + memset(foo, 0, 64*sizeof(int)); // <--- Fails + + _Cilk_sync; + + return a+b; +} + +int main(void) { + if (sum(0, 100) != 5050) + __builtin_abort (); + return 0; +} -- 2.30.2