From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 59296384587A for ; Sat, 10 Dec 2022 15:54:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 59296384587A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x435.google.com with SMTP id co23so8015374wrb.4 for ; Sat, 10 Dec 2022 07:54:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=gx08JEiaclZFMZX6DE2Nu0jOIodioe4bpJBvVwDFhc4=; b=dDwrq4YHM28Qx1ZaMAZJVx11FgWzf45r2eP25rgv70zbd+VHF8PQ1NmFtnpR9YDevk OCA9oFXJuVLWRShXTnNFRy0mMmhhrnyurrH1gVI5v5YSUPhosvtwwbrFLMHSh7bnbqrA PKUqbHBxTKmu3dQlnRG73xwIg2XNRx3xOHooUTqymXu5q8zSMeGD0/6nsfg1ILO7txLu 2zQ+u+wzTSc6nxo+4WeUc7i754WM7JLMSWDrl+BjY2I5SlkLie2SAEdnO4RoteFYjjHk aCqrplQOOOp0lj66sMqO7+yKvfsMgd67t8BDtUCe5CcD5fUajNpUR+k5665BsU/VU7mc 8wQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gx08JEiaclZFMZX6DE2Nu0jOIodioe4bpJBvVwDFhc4=; b=LmjXQQD+84Gu3DVv55e7qK2/EFjaC1rvg5ZBfwTG0Z3o7PBE6cOB3uOvx8LWhOQkxU lJ9wzRPkokOb9y+rwIX13lSKeh7RLUP6m2hjSClwXU+AwEmUNi1X61t/aY4+uaPHJJ5O yEQmKW7QIrO2Ic9g5rUop2ctWpBiFVWe5i6Q3d3W9R26L414QGAdPVoxLnzXrkTRA/zk vPp/eUq3pUFn2IV0WT45kln1Y26wkc6qNYkJjXwlZi2mW1/xPkOLOw0jvLQt1nYs50NB voJaBbz92ECuXFy/hAeZVFEwwcFGmveTEw23qAeuH4ouWkqgoPRLxjVw/zo6Ub33OCnu +Ciw== X-Gm-Message-State: ANoB5pniRNhFe+mzkR+4Nsb/siBjyydTrTB8if0QZRvDBj945fRCCN2o 3k0OdleZ1hmE1SvlAcfT7qrk5Omgmcc= X-Google-Smtp-Source: AA0mqf5t8jjMScGnimB3fZpHf//Vu8/XNtI6H7Zh+gvshQs4I09jO4Uj7zS+/nXD3ETPl9DM5i3iSA== X-Received: by 2002:a5d:62cb:0:b0:241:fb10:9369 with SMTP id o11-20020a5d62cb000000b00241fb109369mr5364651wrv.21.1670687668946; Sat, 10 Dec 2022 07:54:28 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id h20-20020adfaa94000000b002367ad808a9sm4145196wrc.30.2022.12.10.07.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 07:54:28 -0800 (PST) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, pinskia@gmail.com Subject: [PATCH] coroutines: Build pointer initializers with nullptr_node [PR107768] Date: Sat, 10 Dec 2022 15:54:27 +0000 Message-Id: <20221210155427.31858-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) Reply-To: iain@sandoe.co.uk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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: From: Andrew Pinski This is Andrew Pinski's patch, I just did testing, adjusted the test case and provided the Changelog. tested on x86-64-Darwin21, OK for trunk? Iain --- >8 --- The PR reports that using integer_zero_node triggers a warning for -Wzero-as-null-pointer-constant which comes from compiler-generated code so makes no sense to the end user. Co-Authored-By: Iain Sandoe PR c++/107768 gcc/cp/ChangeLog: * coroutines.cc (coro_rewrite_function_body): Initialize pointers from nullptr_node. (morph_fn_to_coro): Likewise. gcc/testsuite/ChangeLog: * g++.dg/coroutines/pr107768.C: New test. --- gcc/cp/coroutines.cc | 6 ++--- gcc/testsuite/g++.dg/coroutines/pr107768.C | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/coroutines/pr107768.C diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index 3f23317a315..88d6c30d8b1 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -4132,7 +4132,7 @@ coro_rewrite_function_body (location_t fn_start, tree fnbody, tree orig, /* We will need to be able to set the resume function pointer to nullptr to signal that the coroutine is 'done'. */ tree zero_resume - = build1 (CONVERT_EXPR, resume_fn_ptr_type, integer_zero_node); + = build1 (CONVERT_EXPR, resume_fn_ptr_type, nullptr_node); /* The pointer to the destroy function. */ tree var = coro_build_artificial_var (fn_start, coro_destroy_fn_id, @@ -4519,7 +4519,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) tree ramp_body = push_stmt_list (); tree zeroinit = build1_loc (fn_start, CONVERT_EXPR, - coro_frame_ptr, integer_zero_node); + coro_frame_ptr, nullptr_node); tree coro_fp = coro_build_artificial_var (fn_start, "_Coro_frameptr", coro_frame_ptr, orig, zeroinit); tree varlist = coro_fp; @@ -4754,7 +4754,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer) gcc_checking_assert (same_type_p (fn_return_type, TREE_TYPE (grooaf))); tree if_stmt = begin_if_stmt (); - tree cond = build1 (CONVERT_EXPR, coro_frame_ptr, integer_zero_node); + tree cond = build1 (CONVERT_EXPR, coro_frame_ptr, nullptr_node); cond = build2 (EQ_EXPR, boolean_type_node, coro_fp, cond); finish_if_stmt_cond (cond, if_stmt); if (VOID_TYPE_P (fn_return_type)) diff --git a/gcc/testsuite/g++.dg/coroutines/pr107768.C b/gcc/testsuite/g++.dg/coroutines/pr107768.C new file mode 100644 index 00000000000..22d7074f261 --- /dev/null +++ b/gcc/testsuite/g++.dg/coroutines/pr107768.C @@ -0,0 +1,26 @@ +// { dg-additional-options "-Wzero-as-null-pointer-constant -fsyntax-only" } + +#include + +struct task +{ + struct promise_type + { + task get_return_object() { return {}; } + std::suspend_never initial_suspend() { return {}; } + std::suspend_never final_suspend() noexcept { return {}; } + void return_void() {} + void unhandled_exception() {} + }; +}; + +task resuming_on_new_thread(void) +{ + struct awaitable + { + bool await_ready() { return false; } + void await_suspend(std::coroutine_handle<> h) { } + void await_resume() {} + }; + co_await awaitable{}; +} -- 2.37.1 (Apple Git-137.1)