From patchwork Sat Dec 5 10:09:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zamyatin, Igor" X-Patchwork-Id: 552990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 32EF01409C2 for ; Sat, 5 Dec 2015 21:09:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=oZInuJF0; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:content-transfer-encoding:mime-version; q=dns; s= default; b=hyTehEC9z7Ix5KZPfYL+rIYSWV8R6+RexFby3pVr3e7YbAf950/zk k+c7YI7ch9+L7a3vKcYE76qREVqJTCTUthZsJW/hcuqFmnQNc2lqPljwfklyGTVR EoW0T3Y3dGxjHPxyNs4ceDC3XCR5OUhDfe8PXbNBJXTOiNB6uQkjlU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:content-transfer-encoding:mime-version; s=default; bh=j/rWXphU5J9uloPcAj8cugZszWg=; b=oZInuJF04xyj30TLm0mMxtxlxZ4H usOv4QAIWoDcBl6N/pgNHPXhXzYyNInsQd9RQ+V2QxmN7BB4Nuvg7ghhr7g4kpdJ ZFiUftx+25Dv7csXzI/oW/yxk/LLUJ55QMGYm7upug+zUW8QMmTPG5z1WJNVg6ut Byh44r/e9TxNlkA= Received: (qmail 116268 invoked by alias); 5 Dec 2015 10:09:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 116253 invoked by uid 89); 5 Dec 2015 10:09:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mga01.intel.com Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 05 Dec 2015 10:09:14 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 05 Dec 2015 02:09:13 -0800 X-ExtLoop1: 1 Received: from irsmsx154.ger.corp.intel.com ([163.33.192.96]) by fmsmga002.fm.intel.com with ESMTP; 05 Dec 2015 02:09:11 -0800 Received: from irsmsx101.ger.corp.intel.com ([169.254.1.236]) by IRSMSX154.ger.corp.intel.com ([169.254.12.98]) with mapi id 14.03.0248.002; Sat, 5 Dec 2015 10:09:11 +0000 From: "Zamyatin, Igor" To: 'Andreas Schwab' CC: "GCC Patches (gcc-patches@gcc.gnu.org)" , "Jeff Law (law@redhat.com)" , "Jakub Jelinek (jakub@redhat.com)" Subject: RE: [PR68001, CilkPlus] Fix for PR68001 Date: Sat, 5 Dec 2015 10:09:10 +0000 Message-ID: <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738CB5BF@IRSMSX101.ger.corp.intel.com> References: <0EFAB2BDD0F67E4FB6CCC8B9F87D756973814270@IRSMSX101.ger.corp.intel.com> <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738AC2E7@IRSMSX101.ger.corp.intel.com> In-Reply-To: <0EFAB2BDD0F67E4FB6CCC8B9F87D7569738AC2E7@IRSMSX101.ger.corp.intel.com> MIME-Version: 1.0 X-IsSubscribed: yes > > > > > 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 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);