From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 2236D385AE4F for ; Tue, 11 Oct 2022 22:06:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2236D385AE4F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665525983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KELWPtP4JX0MINTmQEgU8dtcQ2lyeZFHG8zcYFR6QC0=; b=TvXgaHN+HT74jYh+6Oa+nyBK3ajP80xv6iQSwCzjt6TloU/1/qRNGe9oLIkifZvd10PjPN 0tEeud7TGx1fxC6lOZuvwq8ufd2n9Y8x00Dtq+XGyNFE/V3EGPXkKsot/0V9cht+M5Frd2 aS/iIrHrEJSR9IMe53OpZSr3Ekf12m0= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-618-8Yh-OGpON1emlRxrW2qdoQ-1; Tue, 11 Oct 2022 18:06:19 -0400 X-MC-Unique: 8Yh-OGpON1emlRxrW2qdoQ-1 Received: by mail-qt1-f197.google.com with SMTP id ff6-20020a05622a4d8600b0039cbf66e8b5so103432qtb.19 for ; Tue, 11 Oct 2022 15:06:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KELWPtP4JX0MINTmQEgU8dtcQ2lyeZFHG8zcYFR6QC0=; b=h+Mjf2Ho3C8QBDBalY4sgop0CGyknBZH7S66OotAsVxZUGMrN8vTng/8Qit9enbJDy e4iLOOYCB+uhPN+PURZNq4ifHxz5mnmWZPX+VbjU9Cm8964WlueTooa6QRIYbf6PpgiG y3VXMmAvxr+VavImI50Oke/CqNVffhwnMfzib5FjxSoZurqd0R7fOCJaQ0we2M39+x/A 7Q7doD0rGMxkvgRzHjkZ0DB3oUUhcobqmPFeo+BqJTaafFtV7upsTBWX2Lxzis8RYmRc 28Ms97C4f98uTPopinzQZNS0Sb+euG5xwGgr9qQYJWP+7mfvOv5vCse17OOK39MTAZP4 M2dg== X-Gm-Message-State: ACrzQf2fbMOg77kABl6iaBD2hMdUyXPuq9l84Sx+z6P6Z7UzNhK7pZXs rwTZaFVhOYRfdf9az9d0Xpy5u4r6bk21y8eBNgfhoiFa14zekquybMpaJaeN8FLcrXGcPl2kCOC TwGXoF9O1iQIrUV7Ccw== X-Received: by 2002:a05:620a:1448:b0:6ec:4576:d0b9 with SMTP id i8-20020a05620a144800b006ec4576d0b9mr12004788qkl.265.1665525979203; Tue, 11 Oct 2022 15:06:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM63BRj+tMYgUN/JgnZ9srylIH5HQ/J6WVP29lBF9GJYdok8aLJYJsCYTqfXdw8lO+CoEZj/Yg== X-Received: by 2002:a05:620a:1448:b0:6ec:4576:d0b9 with SMTP id i8-20020a05620a144800b006ec4576d0b9mr12004763qkl.265.1665525978847; Tue, 11 Oct 2022 15:06:18 -0700 (PDT) Received: from [192.168.1.101] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id cm26-20020a05622a251a00b0039cb59f00fcsm1531692qtb.30.2022.10.11.15.06.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Oct 2022 15:06:18 -0700 (PDT) Message-ID: <44bcfe36-d570-c8d4-7980-4e8b2a2aac60@redhat.com> Date: Tue, 11 Oct 2022 18:06:17 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.2 Subject: Re: [PATCH] coroutines: Use cp_build_init_expr consistently. To: iain@sandoe.co.uk, gcc-patches@gcc.gnu.org References: <20221011215831.67154-1-iain@sandoe.co.uk> From: Jason Merrill In-Reply-To: <20221011215831.67154-1-iain@sandoe.co.uk> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 10/11/22 17:58, Iain Sandoe wrote: > Tested on x86_64-darwin19, OK for master? > thanks > Iain > > -- >8 -- > > Now we have the TARGET_EXPR_ELIDING_P flag, it is important to ensure it > is set properly on target exprs. The code here has a mixture of APIs used > to build inits. This patch changes that to use cp_build_init_expr() where > possible, since that handles setting the flag. Hmm, I wouldn't expect this to be necessary, since cp_build_modify_expr calls cp_build_init_expr for INIT_EXPR. Perhaps the similarity of the function names is a trap... > --- > gcc/cp/coroutines.cc | 25 ++++++++----------------- > 1 file changed, 8 insertions(+), 17 deletions(-) > > diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc > index 01a3e831ee5..20d309445eb 100644 > --- a/gcc/cp/coroutines.cc > +++ b/gcc/cp/coroutines.cc > @@ -1025,8 +1025,7 @@ build_co_await (location_t loc, tree a, suspend_point_kind suspend_kind) > else > { > e_proxy = get_awaitable_var (suspend_kind, o_type); > - o = cp_build_modify_expr (loc, e_proxy, INIT_EXPR, o, > - tf_warning_or_error); > + o = cp_build_init_expr (loc, e_proxy, o); > } > > /* I suppose we could check that this is contextually convertible to bool. */ > @@ -2889,8 +2888,7 @@ flatten_await_stmt (var_nest_node *n, hash_set *promoted, > gcc_checking_assert (!already_present); > tree inner = TREE_OPERAND (init, 1); > gcc_checking_assert (TREE_CODE (inner) != COND_EXPR); > - init = cp_build_modify_expr (input_location, var, INIT_EXPR, init, > - tf_warning_or_error); > + init = cp_build_init_expr (var, init); > /* Simplify for the case that we have an init containing the temp > alone. */ > if (t == n->init && n->var == NULL_TREE) > @@ -3656,8 +3654,7 @@ await_statement_walker (tree *stmt, int *do_subtree, void *d) > if (TREE_CODE (cond_inner) == CLEANUP_POINT_EXPR) > cond_inner = TREE_OPERAND (cond_inner, 0); > location_t sloc = EXPR_LOCATION (SWITCH_STMT_COND (sw_stmt)); > - tree new_s = cp_build_init_expr (sloc, newvar, > - cond_inner); > + tree new_s = cp_build_init_expr (sloc, newvar, cond_inner); > finish_expr_stmt (new_s); > SWITCH_STMT_COND (sw_stmt) = newvar; > /* Now add the switch statement with the condition re- > @@ -4902,9 +4899,8 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) > if (flag_exceptions) > { > /* This var is now live. */ > - r = build_modify_expr (fn_start, parm.guard_var, > - boolean_type_node, INIT_EXPR, fn_start, > - boolean_true_node, boolean_type_node); > + r = cp_build_init_expr (fn_start, parm.guard_var, > + boolean_true_node); > finish_expr_stmt (r); > } > } > @@ -4948,9 +4944,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) > r = coro_build_cvt_void_expr_stmt (r, fn_start); > finish_expr_stmt (r); > > - r = build_modify_expr (fn_start, coro_promise_live, boolean_type_node, > - INIT_EXPR, fn_start, boolean_true_node, > - boolean_type_node); > + r = cp_build_init_expr (fn_start, coro_promise_live, boolean_true_node); > finish_expr_stmt (r); > > promise_dtor > @@ -5031,8 +5025,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) > NULL_TREE); > add_decl_expr (gro); > gro_bind_vars = gro; > - r = cp_build_modify_expr (input_location, gro, INIT_EXPR, get_ro, > - tf_warning_or_error); > + r = cp_build_init_expr (gro, get_ro); > /* The constructed object might require a cleanup. */ > if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (gro_type)) > { > @@ -5053,9 +5046,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) > cleanup. */ > if (gro_ret_dtor) > { > - r = build_modify_expr (fn_start, coro_gro_live, boolean_type_node, > - INIT_EXPR, fn_start, boolean_true_node, > - boolean_type_node); > + r = cp_build_init_expr (fn_start, coro_gro_live, boolean_true_node); > finish_expr_stmt (r); > } > /* Initialize the resume_idx_var to 0, meaning "not started". */