From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B64183857B85 for ; Mon, 24 Oct 2022 17:31:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B64183857B85 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666632689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XWNJBXa2La5bRQVTgFq331AjfMhlS3XwKDXcRR0puZc=; b=ADdtSk7mCo0Vh5apGoIufCK+2eTiptIjzwu+Kt9ildVVKtP7KT3EXkxweLWY4ykGIcI/c/ ueQPHkDLCxbBH+uZ+0ZZ69ClIXiooxQokFZ3iVQ7LFKUT2xDZKpoJqEuKeatKPDflxE1wU S6y7U30DSLlUGO5udiFcAvwjrQ+2OS4= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-498-SqmqQiu8MEqtasJvop3gnA-1; Mon, 24 Oct 2022 13:31:28 -0400 X-MC-Unique: SqmqQiu8MEqtasJvop3gnA-1 Received: by mail-qt1-f198.google.com with SMTP id k12-20020ac8474c000000b0039cdd680ccaso7437554qtp.1 for ; Mon, 24 Oct 2022 10:31:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XWNJBXa2La5bRQVTgFq331AjfMhlS3XwKDXcRR0puZc=; b=ypo2lgc9h8QQ2taeKd/bI7N2WNMuZoxrpZAqQghHsitUpAKOQBK3GL2RL4HJv7/B6b m2ST+PawIFIikyxEU3xUhbaCAvQj0cCOalM4TwHkNO51V9RGthzWtc9mBkX1OL3Hsxte ntbX1snFuojOoVcfvJVp++cJzfjikrFOjcH6xdvjga8Ol/z/QJPcc8MtN1F7b7tOo3OK YAd/BmpUb5UKuNDhaU0Eo76JpD0DSsaSEBipwPi48W0+vpUimkJ/9WS8ql9gNE5nTiZC sKrG3E0Ef9iVBtS3bjpfTlOTQJajmqA3Bo8EYRjXjPG9OXTEjHtzDIn0/r/9XbOkF5rs 92yQ== X-Gm-Message-State: ACrzQf2aCzESrn4YFLyUbohpVykQdpttSf0HNqRt7zEuTZqAFUzys3ZP C3kTZWSoNI/f0TdxNyE6dnfIc6fsqW6H981v9ag+5NJn292D921xRFPyb/hLF2OFZdi1IRpxxf6 4YPbqb5WEDufIL/okcQ== X-Received: by 2002:a05:620a:27d6:b0:6ee:c904:546a with SMTP id i22-20020a05620a27d600b006eec904546amr24382458qkp.701.1666632687654; Mon, 24 Oct 2022 10:31:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM67OhxNwY3RFjH3GUUtRy0cLveM2RmN7LI9AT7/68cmWVCW4x27ETQ2Y1VCHaNHXOh3jUEXFw== X-Received: by 2002:a05:620a:27d6:b0:6ee:c904:546a with SMTP id i22-20020a05620a27d600b006eec904546amr24382427qkp.701.1666632687300; Mon, 24 Oct 2022 10:31:27 -0700 (PDT) Received: from [192.168.1.101] (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 o11-20020ac85a4b000000b0039cc944ebdasm256684qta.54.2022.10.24.10.31.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Oct 2022 10:31:26 -0700 (PDT) Message-ID: <45b48f5f-a641-9d20-3f5d-f05a76e28b5e@redhat.com> Date: Mon, 24 Oct 2022 13:31:25 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: [PATCH v2] c++: ICE with invalid structured bindings [PR107276] To: Marek Polacek Cc: GCC Patches References: <20221021232922.1093229-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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 List-Id: On 10/24/22 13:13, Marek Polacek wrote: > 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? OK. > -- >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 > > 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. */ > > base-commit: 131d18e928a3ea1ab2d3bf61aa92d68a8a254609