From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29536 invoked by alias); 2 Dec 2015 07:50:09 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 29515 invoked by uid 89); 2 Dec 2015 07:50:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 02 Dec 2015 07:50:07 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1a42As-00056g-Gg from Tom_deVries@mentor.com ; Tue, 01 Dec 2015 23:50:02 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server id 14.3.224.2; Wed, 2 Dec 2015 07:50:00 +0000 Subject: Re: [PR68001, CilkPlus] Fix for PR68001 To: "Zamyatin, Igor" , 'Andreas Schwab' References: <0EFAB2BDD0F67E4FB6CCC8B9F87D756973814270@IRSMSX101.ger.corp.intel.com> <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738AC2E7@IRSMSX101.ger.corp.intel.com> CC: "GCC Patches (gcc-patches@gcc.gnu.org)" , "Jeff Law (law@redhat.com)" , "Jakub Jelinek (jakub@redhat.com)" From: Tom de Vries Message-ID: <565EA269.9070004@mentor.com> Date: Wed, 02 Dec 2015 07:50:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738AC2E7@IRSMSX101.ger.corp.intel.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2015-12/txt/msg00198.txt.bz2 On 30/11/15 21:43, Zamyatin, Igor wrote: >> >> 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. > Please add PR objc++/68511 to the ChangeLog entrie. Thanks, - Tom > Bootstrapped and regtested on x86_64, ok for trunk? > > Thanks, > Igor > > cp/Changelog > > 2015-11-27 Igor Zamyatin > > 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); > > >