From: "Zamyatin, Igor" <igor.zamyatin@intel.com>
To: 'Andreas Schwab' <schwab@suse.de>
Cc: "GCC Patches (gcc-patches@gcc.gnu.org)" <gcc-patches@gcc.gnu.org>,
"Jeff Law (law@redhat.com)" <law@redhat.com>,
"Jakub Jelinek (jakub@redhat.com)" <jakub@redhat.com>
Subject: RE: [PR68001, CilkPlus] Fix for PR68001
Date: Sat, 05 Dec 2015 10:09:00 -0000 [thread overview]
Message-ID: <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738CB5BF@IRSMSX101.ger.corp.intel.com> (raw)
In-Reply-To: <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738AC2E7@IRSMSX101.ger.corp.intel.com>
>
> >
> > FAIL: obj-c++.dg/property/dotsyntax-11.mm -fgnu-runtime (test for
> > errors, line 51)
> > FAIL: obj-c++.dg/property/dotsyntax-11.mm -fgnu-runtime (test for
> > errors, line 56)
> > FAIL: obj-c++.dg/property/dotsyntax-11.mm -fgnu-runtime (test for
> > errors, line 59)
> >
> > Andreas.
>
> Here is the patch that properly limits GS_ERROR exit only in case of error in
> cilk spawn detection.
>
Resending with PR68511 mentioned in Changelog
Bootstrapped and regtested on x86_64, ok for trunk?
Thanks,
Igor
cp/Changelog
2015-12-04 Igor Zamyatin <igor.zamyatin@intel.com>
PR objc++/68511
PR c++/68001
* cp-gimplify.c (cp_gimplify_expr): Limit GS_ERROR only in case of
error in cilk spawn detection.
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 09ee5ff..3dbbd7f 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -559,6 +559,7 @@ int
cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
{
int saved_stmts_are_full_exprs_p = 0;
+ bool is_spawn_detected = true;
enum tree_code code = TREE_CODE (*expr_p);
enum gimplify_status ret;
@@ -614,12 +615,12 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
25979. */
case INIT_EXPR:
if (fn_contains_cilk_spawn_p (cfun)
- && cilk_detect_spawn_and_unwrap (expr_p))
+ && (is_spawn_detected = cilk_detect_spawn_and_unwrap (expr_p)))
{
cilk_cp_gimplify_call_params_in_spawned_fn (expr_p, pre_p, post_p);
return (enum gimplify_status) gimplify_cilk_spawn (expr_p);
}
- if (seen_error ())
+ if (!is_spawn_detected && seen_error ())
return GS_ERROR;
cp_gimplify_init_expr (expr_p);
prev parent reply other threads:[~2015-12-05 10:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 20:08 Zamyatin, Igor
2015-11-02 22:11 ` Jeff Law
2015-11-24 13:53 ` Andreas Schwab
2015-11-30 20:49 ` Zamyatin, Igor
2015-12-02 7:50 ` Tom de Vries
2015-12-05 10:09 ` Zamyatin, Igor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0EFAB2BDD0F67E4FB6CCC8B9F87D7569738CB5BF@IRSMSX101.ger.corp.intel.com \
--to=igor.zamyatin@intel.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=law@redhat.com \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).