From patchwork Fri Oct 21 23:29:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 7024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp950426wrr; Fri, 21 Oct 2022 16:30:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BZAwbeVjULmnjrmP6mDUEXK3SA7bNGj2gG3CmFrEjIpTrveoDPXv7Bjy3LVf+MStnAGtZ X-Received: by 2002:aa7:c6c8:0:b0:460:e19b:ec12 with SMTP id b8-20020aa7c6c8000000b00460e19bec12mr9364386eds.209.1666395059729; Fri, 21 Oct 2022 16:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666395059; cv=none; d=google.com; s=arc-20160816; b=JJGet2BOexPv0X+zUb/gSiMSjPdgiLTm0wdOnFJRQPMFqxsbWik+bi9FqM2nvW4D6m Agx2Ub1L4NfcDh7FLgLDxDvR7KVNRb1D+WZAI0N25GSeEbydFP9iBnhzDMApWoKzKORS ANxPwcEdzBtxikL3GpRC/B17Pnzj535Nf6UFPlWPVGTVBduL+josnifDmbpljXK/0r18 Xg7QJWHL6x4qdv5L4BudLKmRRPAgQOeg2RzZlHAmTwzgZp4UnfUwedN5yeApEmkDAZl3 53ImU/Xi8dukANaPMH4ZJ6yN1wLscfEWBTIEXIBd7GWhNpwWY1eqnI8v4CNDI5Gm3clQ 2j9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=NFyz/pOJeCmWg+h3OVhMqFGut9/8WpH81No+qqjNXlU=; b=tMWEp11c9jC8NYy6a4LDFCOvsuM5ciksOh+ClMAh4SzeyxIvxMBTYXzFXAuhYAV+Mb C65nuK/tsWfVtA8HvEMgal7REMdOppz5qzt/1gej0JMCjISmpPRT8FOMx2AbiIlKU7kV FgKsbHBBu9q2E0XVAJA0a5u6z3bov35R9wGCnjcpRArf5n9jCeZC33zUcYvjeiUVQonv zSnaK5xCgW0tUibteKD9ucsCBBEKJr6pljH0ciugNDBi49whAyX4pKs4FpTFy7fGsir9 fNaeS4VJd20xCO4vukQbQqdlG8FwBrWd2qMRZ1zV0s9i5lXqpVOoFCp4EFyOURP7vB/t x/5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Afcc+Vti; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id z12-20020a50eb4c000000b004594b742e0asi19564805edp.323.2022.10.21.16.30.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 16:30:59 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Afcc+Vti; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 449D93852B4D for ; Fri, 21 Oct 2022 23:30:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 449D93852B4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666395058; bh=NFyz/pOJeCmWg+h3OVhMqFGut9/8WpH81No+qqjNXlU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Afcc+VtiAzsCzpX1otnvap77Y0z/LCaIH2A4ka/PWMavQdRH1nbV3ibNvMTYuDRhq UpUIoJgrPQykSBSiocs8pf+AyyNREHyoowq2XMrr+CspavBj4UCzOZVtxIugRteEBW i/NTzeRNDx5S3ls3/5eRGzXP6FsXuL44vSnZBTf4= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 2525C3852B61 for ; Fri, 21 Oct 2022 23:29:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2525C3852B61 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-155-sqx5A33DPCiwmUnfptbZ9A-1; Fri, 21 Oct 2022 19:29:25 -0400 X-MC-Unique: sqx5A33DPCiwmUnfptbZ9A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78D33800B23 for ; Fri, 21 Oct 2022 23:29:25 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.9.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FCB82024CBB; Fri, 21 Oct 2022 23:29:25 +0000 (UTC) To: Jason Merrill , GCC Patches Subject: [PATCH] c++: ICE with invalid structured bindings [PR107276] Date: Fri, 21 Oct 2022 19:29:22 -0400 Message-Id: <20221021232922.1093229-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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, RCVD_IN_MSPIKE_H2, 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: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747341866198597907?= X-GMAIL-MSGID: =?utf-8?q?1747341866198597907?= This test ICEs in C++23 because we reach the new code in do_auto_deduction: 30468 if (cxx_dialect >= cxx23 30469 && context == adc_return_type 30470 && (!AUTO_IS_DECLTYPE (auto_node) 30471 || !unparenthesized_id_or_class_member_access_p (init)) 30472 && (r = treat_lvalue_as_rvalue_p (maybe_undo_parenthesized_ref (init), 30473 /*return*/true))) where 'init' is "VIEW_CONVERT_EXPR<<<< error >>>>(y)", and then the move in treat_lvalue_as_rvalue_p returns error_mark_node whereupon set_implicit_rvalue_p crashes. I don't think such V_C_Es are useful so let's not create them. But that won't fix the ICE so I'm checking the return value of move. A structured bindings decl can have an error type, that is set in cp_finish_decomp: 8908 TREE_TYPE (first) = error_mark_node; therefore I think treat_lvalue_as_rvalue_p just needs to cope. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? PR c++/107276 gcc/cp/ChangeLog: * typeck.cc (treat_lvalue_as_rvalue_p): Check the return value of move. gcc/ChangeLog: * tree.cc (maybe_wrap_with_location): Don't create a location wrapper when the type is erroneous. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/decomp4.C: New test. --- gcc/cp/typeck.cc | 7 ++++++- gcc/testsuite/g++.dg/cpp2a/decomp4.C | 8 ++++++++ gcc/tree.cc | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/decomp4.C base-commit: d155442de043c1bef7d27cf2d6be4eba618afcb9 diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index 16e7d85793d..5ca191759f6 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -10726,7 +10726,12 @@ treat_lvalue_as_rvalue_p (tree expr, bool return_p) if (DECL_CONTEXT (retval) != current_function_decl) return NULL_TREE; if (return_p) - return set_implicit_rvalue_p (move (expr)); + { + expr = move (expr); + if (expr == error_mark_node) + return NULL_TREE; + return set_implicit_rvalue_p (expr); + } /* if the operand of a throw-expression is a (possibly parenthesized) id-expression that names an implicitly movable entity whose scope does not diff --git a/gcc/testsuite/g++.dg/cpp2a/decomp4.C b/gcc/testsuite/g++.dg/cpp2a/decomp4.C new file mode 100644 index 00000000000..28b3f172b53 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/decomp4.C @@ -0,0 +1,8 @@ +// PR c++/107276 +// { dg-do run { target c++20 } } + +auto f(auto x) { + auto [y] = x; // { dg-error "cannot decompose" } + return y; +} +int i = f(0); diff --git a/gcc/tree.cc b/gcc/tree.cc index 81a6ceaf181..4e5b1df4d85 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -14352,7 +14352,8 @@ maybe_wrap_with_location (tree expr, location_t loc) /* For now, don't add wrappers to exceptional tree nodes, to minimize any impact of the wrapper nodes. */ - if (EXCEPTIONAL_CLASS_P (expr)) + if (EXCEPTIONAL_CLASS_P (expr) + || (TREE_TYPE (expr) && EXCEPTIONAL_CLASS_P (TREE_TYPE (expr)))) return expr; /* Compiler-generated temporary variables don't need a wrapper. */