From patchwork Fri Sep 30 22:06:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 58241 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 23F45385828A for ; Fri, 30 Sep 2022 22:08:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23F45385828A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664575705; bh=SAYU/3Oxah2WcKqRl924OPQ1aSSePyjYD37XuaWVgIA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mTKUWgiG1tDWv8R0Q1RAE65xpR6UhBRIAH7XwFPxZgKlE6Aua2tDM+IIZACIG0wfH SY6S9nvTpfJQIN0XIrooLBD+ZKLvQ3QkYVt1NutWgm12TwEfI6Nj1rIBV41c/Nm6Gm ggri1bxXR6/64jkAbcc3+ZD8/+87/gxAxuwWjTFI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 5FB6C3858D1E for ; Fri, 30 Sep 2022 22:06:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5FB6C3858D1E 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-64-aJbdrSWoN5WenVtPsjrtlw-1; Fri, 30 Sep 2022 18:06:27 -0400 X-MC-Unique: aJbdrSWoN5WenVtPsjrtlw-1 Received: by mail-qt1-f197.google.com with SMTP id bn4-20020a05622a1dc400b0035d24923a7fso3824191qtb.0 for ; Fri, 30 Sep 2022 15:06:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=SAYU/3Oxah2WcKqRl924OPQ1aSSePyjYD37XuaWVgIA=; b=ejL9WBYWts6SCtGBVeVh3rG95IwY9GBZ1NDlkXJuBNBjgGPZ5YhcqtdNk+8t/95MU+ yI90h7hUSp3LlGmRGenp7xsGYWWg3TmfhyiQNauFYWMrnBNzjbvXlTb7opnxrTIrNzwV Er3N6elUwAMzKs+WV31cu0X4BnjAPqn2ZJFVb5qtU/O9wkneuXRtoPKC47rkPSXF37lQ +iGXUqvwSCJqcy9vO429g546QJd7p24oX1lxcvILdRR5Fq9DMnS8/A8qSzsBhX3lf7bd E3dNWsdl+AXTfEkh8LnXItPCntI6AXwPlfs9Bgytlov/3IYLK6/PAX8g5tmnIkNGt+bs cQ5g== X-Gm-Message-State: ACrzQf2wHm1uM4UO8h3253zVrwaUNqh1cQXZKgdEOeWrZRIGVZEfi0Ge vtBYg0CRMs11g4z9z5I1fgZcuXeNh6bMgE5yabNZDJBov5/kM9dmkjOX6plo2QvYWBXZLT54e3A SfIJFAEa4vEKTyrOsWPdophFFWsVx/aOBqejnd4woGgpOQBjYgRR/35yg/OI5+XotFQ== X-Received: by 2002:a05:6214:b27:b0:4a5:e6df:2007 with SMTP id w7-20020a0562140b2700b004a5e6df2007mr8651848qvj.96.1664575587184; Fri, 30 Sep 2022 15:06:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ftKLY0cEMvinmaVYctbi3mbDJfN/ishv6AiN4mYpeRD7AUpELWuyYoT+CIRUuOW/phiSqpw== X-Received: by 2002:a05:6214:b27:b0:4a5:e6df:2007 with SMTP id w7-20020a0562140b2700b004a5e6df2007mr8651813qvj.96.1664575586710; Fri, 30 Sep 2022 15:06:26 -0700 (PDT) Received: from barrymore.redhat.com (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 s17-20020a05620a29d100b006cbc00db595sm3726503qkp.23.2022.09.30.15.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 15:06:25 -0700 (PDT) To: gcc-patches@gcc.gnu.org, Iain Sandoe Subject: [PATCH RFC] c++: fix broken conversion in coroutines Date: Fri, 30 Sep 2022 18:06:23 -0400 Message-Id: <20220930220623.2161990-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" You can't use CONVERT_EXPR to convert between two class types, and it was breaking copy elision. Unfortunately, this patch breaks symmetric-transfer-00-basic.C, where susp_type is Loopy::handle_type. How is this supposed to work? gcc/cp/ChangeLog: * coroutines.cc (expand_one_await_expression): Change conversion to assert. --- gcc/cp/coroutines.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 43faf3e5445b571731e52faa1be085ecd0a09323 diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index eca01abcb7a..568f2edf67d 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -1728,7 +1728,9 @@ expand_one_await_expression (tree *stmt, tree *await_expr, void *d) } else { - r = build1_loc (loc, CONVERT_EXPR, void_coro_handle_type, suspend); + gcc_checking_assert (same_type_ignoring_top_level_qualifiers_p + (void_coro_handle_type, susp_type)); + r = suspend; r = build2_loc (loc, INIT_EXPR, void_coro_handle_type, data->conthand, r); r = build1 (CONVERT_EXPR, void_type_node, r); append_to_statement_list (r, &body_list);