From patchwork Sun Oct 3 19:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 45745 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1812B3858420 for ; Sun, 3 Oct 2021 19:46:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1812B3858420 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633290365; bh=tLyAfyOtUGi4tLVpq0hDkRzZYslEVb+22eHdR9K9V7c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=NfkvyBeNwQPyAvxJ9p+5g4YE5f/HysTjzeq+MpEO0+ZN5xEfpfs7fYNZTDmP2nTrS uof7HDSy+FYszen3coTBhROHP+VQvQ//3QgzD/4gBR/p1lmB+vEqebcs+IyvHI5OWc KSH+MxNS6eGy12ZtDDm2sBxOU3iX/dJInuvJWrzM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 358E73858D39 for ; Sun, 3 Oct 2021 19:45:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 358E73858D39 Received: by mail-wr1-x435.google.com with SMTP id o20so8453155wro.3 for ; Sun, 03 Oct 2021 12:45:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=tLyAfyOtUGi4tLVpq0hDkRzZYslEVb+22eHdR9K9V7c=; b=DjtFTbjXIbi4jA5PhYGYZ3wIetvecuspCEZLChBXTBYrn/AUn3iM1IG6sKoQ771uLv PuTQ2EL5OWCvhoE1imZjcX1D++KWcNc8l71buZZWT1veIi/AJPyT3bsB8wueNzEESZ+v aHHTh0jMPKbd5FwNFZhFln0HchB3jxsjHmfd9Yil0DRzt7HKKZjVsMNB7Oem9LL44UdL +aoMsWuU+mp1jwKIS0eDiftuyref1pqTHBnURJJg5+LDt+41Uq1YranRJxo6gm8mB8oX 2K+9NfCy+9rXbURPe/v6FVNBRP6l+iFKkRv6ptcSHDYo2u7/Wa7DV5JhcnCICs/gpmYt kaxA== X-Gm-Message-State: AOAM5303N4EIIuBKj2jD3DiOHw5YVAroxU4wN/D46d6EuguJtgALUsnw uqwX5OpSwjk5owFkThQp4/m1Ybi2HYBtKQ== X-Google-Smtp-Source: ABdhPJw8JEtmbZK48SBE4DP27ZdbfLojDYXx21bzqqMyyE2ZgWWlOpb7ZOGC6zgzphbq/nCyDpqBRg== X-Received: by 2002:adf:d1c4:: with SMTP id b4mr10197502wrd.356.1633290335095; Sun, 03 Oct 2021 12:45:35 -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 f63sm13829350wma.24.2021.10.03.12.45.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Oct 2021 12:45:34 -0700 (PDT) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [pushed] coroutines: Look through NOPs for awaiter variables [PR 99575]. Date: Sun, 3 Oct 2021 20:45:27 +0100 Message-Id: <20211003194527.67333-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, There was a missing STRIP_NOPS which meant that, in some cases, an awaiter variable could be hidden by a view-convert-expr. tested on x86_64, powerpc64le linux and x86_86 darwin. pushed to master as trivial/obvious. thanks, Iain Signed-off-by: Iain Sandoe PR c++/99575 gcc/cp/ChangeLog: * coroutines.cc (build_co_await): Strip NOPs from candidate awaiter expressions before testing to see if they need a temporary. gcc/testsuite/ChangeLog: * g++.dg/coroutines/pr99575.C: New test. --- gcc/cp/coroutines.cc | 1 + gcc/testsuite/g++.dg/coroutines/pr99575.C | 35 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gcc/testsuite/g++.dg/coroutines/pr99575.C diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index 2f45575bd92..876a14606f8 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -1008,6 +1008,7 @@ build_co_await (location_t loc, tree a, suspend_point_kind suspend_kind) } /* 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))) { diff --git a/gcc/testsuite/g++.dg/coroutines/pr99575.C b/gcc/testsuite/g++.dg/coroutines/pr99575.C new file mode 100644 index 00000000000..d5f86c1812e --- /dev/null +++ b/gcc/testsuite/g++.dg/coroutines/pr99575.C @@ -0,0 +1,35 @@ + +#include + +class Task { + public: + struct promise_type { + Task get_return_object() { return Task{}; } + std::suspend_always initial_suspend() { return {}; } + std::suspend_always final_suspend() noexcept { return {}; } + void unhandled_exception() {} + void return_void() {} + }; + + bool await_ready() const { return false; } + void await_suspend(std::coroutine_handle continuation) {} + void await_resume() {} +}; + +class NonMoveableTask { + public: + NonMoveableTask() = default; + NonMoveableTask(const NonMoveableTask&) = delete; + NonMoveableTask(NonMoveableTask&&) = delete; + + NonMoveableTask& operator=(const NonMoveableTask&) = delete; + NonMoveableTask& operator=(NonMoveableTask&& other) = delete; + + bool await_ready() const { return false; } + void await_suspend(std::coroutine_handle) {} + void await_resume() {} +}; + +Task Foo(NonMoveableTask* task) { co_await* task; } + +int main() {}