From patchwork Mon Oct 24 17:13:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 9870 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp563434wru; Mon, 24 Oct 2022 10:14:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6sNbNQz+KOAWaFwWkEx3gvoB6g6WNxPlGjlL+1NJk9ixfqbrUujl6xUSHk3a7E+WCmdfag X-Received: by 2002:a17:907:1629:b0:79d:aa05:3783 with SMTP id hb41-20020a170907162900b0079daa053783mr14355486ejc.637.1666631657481; Mon, 24 Oct 2022 10:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666631657; cv=none; d=google.com; s=arc-20160816; b=QGSTfDxcxQhhBYUJfX4akOW9ZPVhRZXph4iJnwiouAQY7zrbNsfJqe7Kd+NaQ6uqce pO6twAi5L1pZ+N8pWgkSzoVs3ao6oaZxLXE7CxdWX4lnpIgUCxJd1MQDN/jAqg8GmNRu mwvofrofsAekg+yiVDk5gM/bAlAiHLJQKBAT3Qekw+Nx1Bkk07GQaSu8tJDCmLtroaAP /0AqynTj1GuTk1ySJ85Kg68vaX8RamQdxzhIkVqUm25UEIevjCoAyA2p0lb2pXjUktVS zrn0eNSRJ/IghbggHUwGsZ4xfbGvaZplJEDVdFCJeeBxMuw57YD+VznapbKjirvMlC+R uIZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-disposition:user-agent:in-reply-to:mime-version:references :message-id:subject:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=+6izJBZmmyYO1tvBWynpWJKE9He3MfgJK7HVNxA1oGw=; b=vjL/XvwRGr9wKOTP5yl3AtBgO0DH9Z9RkK7nU9DaTDOgl2WRkQW7u2pKhjwSpq116V QkXaqws6C+mDT3umd0tmZVVcLLVFlEm5Z4OAgoW9XE0GXbvrwIzqAnnogQpDe43YD87K sD+w7tEuuMiHFOeJZAbG+FvST19q75pRo8ud9x36a7e4/nbMqEdLn4VNO3b48YM/ulEE hkowl3y4OKTFFw483xNazGSp3czYTi5Wf7JUz3Dvz1S3eh0Y9vuMrV0GQ/uWdmVfRppm OZXCB32SeaGgVh7Y+D/2c/FgOmRv8lCkeVl4UzObDZfb9kUmW9y+QsKaVh6itQ2Uwv1G ZJjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=m9AWXbId; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id hd16-20020a170907969000b0078de8d119d5si297589ejc.899.2022.10.24.10.14.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 10:14:17 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=m9AWXbId; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 78A85385703C for ; Mon, 24 Oct 2022 17:14:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78A85385703C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666631655; bh=+6izJBZmmyYO1tvBWynpWJKE9He3MfgJK7HVNxA1oGw=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=m9AWXbIdQwQ/bpjHxrLveiY+dnNLlkvQI79M4SELYnKrHt/hHprTq+Ui28vT+q6Gf dUrN0WlFJt86UdCXQFDvuXINrLA2ZAYdDc2O14dZuQTaSM6rgsG5T+Bp+y5BkhWd/e QDCUxl9NJTE4XMWv1MIvwOrQQ3hEtyRaakG8ACrw= 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 317B63858421 for ; Mon, 24 Oct 2022 17:13:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 317B63858421 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-211-jDT9s6yhOT6ixiCXZ86dLQ-1; Mon, 24 Oct 2022 13:13:28 -0400 X-MC-Unique: jDT9s6yhOT6ixiCXZ86dLQ-1 Received: by mail-qt1-f197.google.com with SMTP id d25-20020ac847d9000000b0039d0dd90182so7429714qtr.3 for ; Mon, 24 Oct 2022 10:13:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+6izJBZmmyYO1tvBWynpWJKE9He3MfgJK7HVNxA1oGw=; b=CVB38MwVHnsz2rBKyP1L2Q/IIqZ4TW82BrjPrIU3bWMpoXrHB3/2qs5VKsu6Q3NYg3 00FR8L2iaHh4/SzxfqJI7+TQOnaAlsBbEiHaSdewFOMN0Pw5Vqjwd3DZ+uQ4kwWdDbOe QqSIBptfaKLVX4DeeZU/3XpIlbQb3nn+WYlG1q57UPepcbzqW2lJ7UDRRpHZIORT2wJT 0kRRZWHlJJG90YYG0RTaOsspDLy0lWD5IUGSM6uB5lH07aqlsY+A70vQ+6QyE7aWHtKa SvMCLPaDDN1rEVQWsbdoQ5bVFoZxYopYLtXAEgn7qlfajFHWXS4XXBikHFQB8/OMOW6d IjRA== X-Gm-Message-State: ACrzQf3EDDvVGD2Rt4UBT+Wpl0VyjL40S7+B9CY7eqdmKN6BB4d+sw99 HCcE+kDDXNJG8DWY93JMPCkmGbYQoMFJVcTIlaW6Qui9J29pOgHBcZkm0XpIa09nWpjKdeLEbBH lT6PnjuFu9DjB75CPiA== X-Received: by 2002:ac8:7d01:0:b0:39c:ebdf:490c with SMTP id g1-20020ac87d01000000b0039cebdf490cmr28879606qtb.179.1666631607955; Mon, 24 Oct 2022 10:13:27 -0700 (PDT) X-Received: by 2002:ac8:7d01:0:b0:39c:ebdf:490c with SMTP id g1-20020ac87d01000000b0039cebdf490cmr28879585qtb.179.1666631607630; Mon, 24 Oct 2022 10:13:27 -0700 (PDT) Received: from redhat.com (2603-7000-9500-2e39-0000-0000-0000-1db4.res6.spectrum.com. [2603:7000:9500:2e39::1db4]) by smtp.gmail.com with ESMTPSA id l16-20020a05622a051000b0039ee562799csm236690qtx.59.2022.10.24.10.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 10:13:27 -0700 (PDT) Date: Mon, 24 Oct 2022 13:13:25 -0400 To: Jason Merrill Subject: [PATCH v2] c++: ICE with invalid structured bindings [PR107276] Message-ID: References: <20221021232922.1093229-1-polacek@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.2.7 (2022-08-07) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-12.5 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 Cc: GCC Patches 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?1747589957246261456?= On Mon, Oct 24, 2022 at 10:31:50AM -0400, Jason Merrill wrote: > On 10/21/22 19:29, Marek Polacek wrote: > > 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 > > > > 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)))) > > I think check error_operand_p instead; I don't think it makes sense to look > for other exceptional nodes in TREE_TYPE. Makes sense. I don't suppose you want to replace the whole condition with error_operand_p, only what comes after ||. Updated patch below, thanks. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- 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. 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 | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/decomp4.C base-commit: 131d18e928a3ea1ab2d3bf61aa92d68a8a254609 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..d1b0c90ee26 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/decomp4.C @@ -0,0 +1,8 @@ +// PR c++/107276 +// { dg-do compile { 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..04603c8c902 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -14352,7 +14352,7 @@ 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) || error_operand_p (expr)) return expr; /* Compiler-generated temporary variables don't need a wrapper. */