From patchwork Wed Aug 21 08:34:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1974760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=AMil0QtQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WpflY6GTGz1yfb for ; Wed, 21 Aug 2024 18:34:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 18A8D3858289 for ; Wed, 21 Aug 2024 08:34:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by sourceware.org (Postfix) with ESMTPS id 5DF043858C3A for ; Wed, 21 Aug 2024 08:34:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DF043858C3A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5DF043858C3A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724229267; cv=none; b=sx344XPYPfsyoP9jHo6tVV4hMYukBnrVSYfe9oSu6bDinfM/Q20CxYQpip14VQv+GX6Hd3EDv3xlUe5JLuGhxdUOVq3nbjkZLtewDDuJK0HA5S7cjEQMDHrab8TKBkn5muWFJ5LfzrlHl1DuDgPxeE+hPsDQIqRavV7nvGvjkF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724229267; c=relaxed/simple; bh=TEMlpJhqGvkZlatmcNqXas8PYbBYPqgRLXrWSye+uDg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=eX626wSUqNZQIH0ebXOtRjM4ITrrVlfxxCpK6h7UHHqe7hqm5Bnhv7JGDyM9ruCmOBwCAZ19VtT0RmiDO0QGgp5Pxd5+qgRu/3GxjTUTtvlneoSpN9fGu9WJjuBpxTTZEACECWcfWl8/uSS6uEQLhVzNWZMmeDUT+55k60KFdy4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5bf009cf4c0so3163806a12.1 for ; Wed, 21 Aug 2024 01:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724229264; x=1724834064; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jDoju46H+L2mhBjAkPu8ssCPwuMlXuFd+/5Do+cnHbs=; b=AMil0QtQ+S5DzALTTN2NpMwpLJ/SQfpIsv6cZ1x7k59pxh9BBir4YqUXMbXXtL48De zDhrE9N8duJboYK2idhKaFKKGTHN6ylXphM0ArWXAjpLVVVLuLXmRV1HDfVEteiBdZs2 TnSR2JCQIHZuysg/rDJpgVBh8r2vTyBzJUvgjkJZeY7xsIjKZyUUwa8ndJgasbhYDsr5 UiOyULugMJpec2mddDcnaGLNwiCUvYWL0NaiQUAbJd5hXH/LwJt421KTfftJFcDrg5Cc Tpdzm+vbVefu95bhOpbRxeEBVsPpJcWsftU2h40SHhZc8CvhWfgkoN5+FG0BqHbnzBj+ srMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724229264; x=1724834064; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jDoju46H+L2mhBjAkPu8ssCPwuMlXuFd+/5Do+cnHbs=; b=vY2cFbLHW464Eno0aoOpXa+4RQeDRu+rkjvZNcLMFXEpzD7aJewFfUOXdOQi78Sw1N 3H1prgdKocAd/JI1M9im8LQjYXszNImBeCbegT95BsjCdJBhlZY/bthhiiI+kePcn63s 2FAQ0D4X0dblEA2plIPBimmXf5wpMWnDRs4pc54zU0e4+sl0LGjMgHd5aBc5ORz+0VrV Kt/Hs2eOxO8s91GZNbhsDCVumGPaDiXRdPHCOzTSKBil8Az0jD6GrRb6D8COZGGgoRom 5l7xSCU0HMCCGIaoM641RsaMhI6o6L+l4xeJBbaDth3++zLVwOpqVsaUP7PAsl3zyODB ocjA== X-Gm-Message-State: AOJu0YyLxh4Q7K/v9gKQddENYVgIb04NMm2wKqL/D4HX/aEXvS/EOuOR 9Vyxj0H+AJmfqp/03ltZNr0j4bNfFEiou3QYjm+xWBZMQV9OQfU07Cq2mz1W X-Google-Smtp-Source: AGHT+IEgM3KdoimtobwWCjNFl0loHMFPXKrI3FOirV8AhyTWkhLU543T8tHyWeCA8txwR9UWn+5CCg== X-Received: by 2002:a05:6402:5cb:b0:5b8:34a9:7fd9 with SMTP id 4fb4d7f45d1cf-5bf1f233279mr867560a12.27.1724229263347; Wed, 21 Aug 2024 01:34:23 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bebc08109esm7778602a12.81.2024.08.21.01.34.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Aug 2024 01:34:23 -0700 (PDT) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com Subject: [PATCH] c++, coroutines: Tidy up awaiter variable checks. Date: Wed, 21 Aug 2024 09:34:22 +0100 Message-Id: <20240821083422.63063-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-darwin, powerpc64le-linux, and against cppcoro and folly coroutines testsuites, OK for trunk? thanks Iain --- 8< --- When we build an await expression, we might need to materialise the awaiter if it is a prvalue. This re-implements this using core APIs instead of local code. gcc/cp/ChangeLog: * coroutines.cc (build_co_await): Simplify checks for the cases that we need to materialise an awaiter. Signed-off-by: Iain Sandoe --- gcc/cp/coroutines.cc | 59 +++++++++----------------------------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index 3356e7f5b24..1f1ea5c2fe4 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -1149,55 +1149,18 @@ build_co_await (location_t loc, tree a, suspend_point_kind suspend_kind, if (!awrs_meth || awrs_meth == error_mark_node) return error_mark_node; - /* To complete the lookups, we need an instance of 'e' which is built from - 'o' according to [expr.await] 3.4. - - If we need to materialize this as a temporary, then that will have to be - 'promoted' to a coroutine frame var. However, if the awaitable is a - user variable, parameter or comes from a scope outside this function, - then we must use it directly - or we will see unnecessary copies. - - If o is a variable, find the underlying var. */ - tree e_proxy = STRIP_NOPS (o); - if (INDIRECT_REF_P (e_proxy)) - e_proxy = TREE_OPERAND (e_proxy, 0); - while (TREE_CODE (e_proxy) == COMPONENT_REF) - { - e_proxy = TREE_OPERAND (e_proxy, 0); - if (INDIRECT_REF_P (e_proxy)) - e_proxy = TREE_OPERAND (e_proxy, 0); - if (TREE_CODE (e_proxy) == CALL_EXPR) - { - /* We could have operator-> here too. */ - tree op = TREE_OPERAND (CALL_EXPR_FN (e_proxy), 0); - if (DECL_OVERLOADED_OPERATOR_P (op) - && DECL_OVERLOADED_OPERATOR_IS (op, COMPONENT_REF)) - { - e_proxy = CALL_EXPR_ARG (e_proxy, 0); - STRIP_NOPS (e_proxy); - gcc_checking_assert (TREE_CODE (e_proxy) == ADDR_EXPR); - e_proxy = TREE_OPERAND (e_proxy, 0); - } - } - STRIP_NOPS (e_proxy); - } - - /* Only build a temporary if we need it. */ - STRIP_NOPS (e_proxy); - if (TREE_CODE (e_proxy) == PARM_DECL - || (VAR_P (e_proxy) && !is_local_temp (e_proxy))) + /* [expr.await]/3.3 If o would be a prvalue, the temporary + materialization conversion ([conv.rval]) is applied. */ + if (!glvalue_p (o) && !xvalue_p (o)) + o = build_target_expr_with_type (o, TREE_TYPE (o), tf_warning_or_error); + + tree e_proxy = o; + if (glvalue_p (o)) + o = NULL_TREE; /* Use the existing entity. */ + else /* We need to materialise it. */ { - e_proxy = o; - o = NULL_TREE; /* The var is already present. */ - } - else - { - tree p_type = o_type; - if (glvalue_p (o)) - p_type = cp_build_reference_type (p_type, !lvalue_p (o)); - e_proxy = get_awaitable_var (suspend_kind, p_type); - o = cp_build_modify_expr (loc, e_proxy, INIT_EXPR, o, - tf_warning_or_error); + e_proxy = get_awaitable_var (suspend_kind, o_type); + o = cp_build_init_expr (loc, e_proxy, convert_from_reference (o)); e_proxy = convert_from_reference (e_proxy); }