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.129.124]) by sourceware.org (Postfix) with ESMTPS id 97B153858D37 for ; Thu, 6 Oct 2022 22:04:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97B153858D37 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=1665093842; 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=MKVtonE1zZm2y4Z7eTY5xkQ1eo6Il9yFUGRTtaKsxVw=; b=WJmMmSjqfCBsNn5dyjMlU840HHx7/dj177i5fT3B6pgJ+XEkWsEmJ9zsKOPiMbnAXcFgp9 lN4YERzfQiuTqVWe54GoZIgH1q5wAJY5HIAwV8eJjvG5Wbr/wCztKxZwUsVS8rApuqspsX CRHmBQK4VszZnEaePmsXM9xSYY8Z3pQ= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-125-7GgrwYrfMYOkWU1F6J4krw-1; Thu, 06 Oct 2022 18:04:01 -0400 X-MC-Unique: 7GgrwYrfMYOkWU1F6J4krw-1 Received: by mail-qv1-f72.google.com with SMTP id dn14-20020a056214094e00b004b1a231394eso1936609qvb.13 for ; Thu, 06 Oct 2022 15:04:01 -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; bh=MKVtonE1zZm2y4Z7eTY5xkQ1eo6Il9yFUGRTtaKsxVw=; b=flV7UjjNrjsjVoC76N36vK4cZkqirM//PvzOrhVc+5smXO+27B7wfTQs2dbflYzKdn IzFFYERFs94wqB1ecKEHcp+DxTz+XPLb2o97TsRP5wkKJFpaont77m1ajEqe+OQqHC3n w5KS5/J3cJY+HEjo8CLA2kWjL1oWMEozK8+SYf4hLO+C8yZVei/6LrrY37AHIHr1jSrh ukAEfE2UnzRlWW+dS/kKF3HFu8Y4O9Gs7xSFup5abIUWAS/4TAnEz7LoPWdf0XjEwdGJ Dvrx+NFXO9IHmvubBC0rHtzdqvLqd9ZqFuK60L3wOJ5ffFXSU3hDoEY9x+Hv1OY0/ovE hl5Q== X-Gm-Message-State: ACrzQf2RA/kbWlq4gFTVtBUgp85kR9BTWmo5BXAWmIEye16X479k8fGd Y0RoQnKZOB0+4dzuY2o2+wBybXRcc/HwRimB7ctPipZh3b5nz8tHBbUl78NvlsGD+Ookp5Rj8+j 0VejSkxWoKQclB8OEyQ== X-Received: by 2002:ac8:7d55:0:b0:35c:d884:449b with SMTP id h21-20020ac87d55000000b0035cd884449bmr2049116qtb.446.1665093840535; Thu, 06 Oct 2022 15:04:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7M7yxqODsYcUEcuAuOCXJzsmlwX91U1dHx/QiOCJCL483tnCkrJ2LLyuwxNxKuzYl4exgnZA== X-Received: by 2002:ac8:7d55:0:b0:35c:d884:449b with SMTP id h21-20020ac87d55000000b0035cd884449bmr2049036qtb.446.1665093839468; Thu, 06 Oct 2022 15:03:59 -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 u10-20020a05620a430a00b006e702033b15sm239461qko.66.2022.10.06.15.03.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Oct 2022 15:03:58 -0700 (PDT) Message-ID: <0ff24d4e-5b8a-ea4e-7225-13d08ddac589@redhat.com> Date: Thu, 6 Oct 2022 18:03:57 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.1 Subject: Re: [PATCH v3] c++: fixes for derived-to-base reference binding [PR107085] To: Marek Polacek Cc: GCC Patches References: <20221005212744.640285-1-polacek@redhat.com> <72137424-81e9-108b-74bc-841a9ea39d2b@redhat.com> <77265139-4274-e922-62c4-2b619fa0a4b4@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=-13.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_LOW,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/6/22 17:43, Marek Polacek wrote: > On Thu, Oct 06, 2022 at 02:00:40PM -0400, Jason Merrill wrote: >> On 10/6/22 13:51, Marek Polacek wrote: >>> On Thu, Oct 06, 2022 at 10:58:44AM -0400, Jason Merrill wrote: >>>> On 10/6/22 10:49, Marek Polacek wrote: >>>>> On Wed, Oct 05, 2022 at 08:25:29PM -0400, Jason Merrill wrote: >>>>>> On 10/5/22 17:27, Marek Polacek wrote: >>>>>>> This PR reports that >>>>>>> >>>>>>> struct Base {}; >>>>>>> struct Derived : Base {}; >>>>>>> static_assert(__reference_constructs_from_temporary(Base const&, Derived)); >>>>>>> >>>>>>> doesn't pass, which it should: it's just like >>>>>>> >>>>>>> const Base& b(Derived{}); >>>>>>> >>>>>>> where we bind 'b' to the Base subobject of a temporary object of type >>>>>>> Derived. The ck_base conversion didn't have ->need_temporary_p set because >>>>>>> we didn't need to create a temporary object just for the base, but the whole >>>>>>> object is a temporary so we're still binding to a temporary. Fixed by >>>>>>> the conv_is_prvalue hunk. >>>>>>> >>>>>>> That broke a bunch of tests. I've distilled the issue into a simple test >>>>>>> in elision4.C. Essentially, we have >>>>>>> >>>>>>> struct B { /* ... */ }; >>>>>>> struct D : B { }; >>>>>>> B b = D(); >>>>>>> >>>>>>> and we set force_elide in build_over_call, but we're unable to actually >>>>>>> elide the B::B(B&&) call, and crash on gcc_assert (!force_elide);. >>>>>>> >>>>>>> says that copy >>>>>>> elision "can only apply when the object being initialized is known not to be >>>>>>> a potentially-overlapping subobject". So I suppose we shouldn't force_elide >>>>>>> the B::B(B&&) call. I don't belive the CWG 2327 code was added to handle >>>>>>> derived-to-base conversions, at that time conv_binds_ref_to_prvalue wasn't >>>>>>> checking ck_base at all. >>>>>>> >>>>>>> Does that make sense? If so... >>>>>>> >>>>>>> Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? >>>>>>> >>>>>>> PR c++/107085 >>>>>>> >>>>>>> gcc/cp/ChangeLog: >>>>>>> >>>>>>> * call.cc (conv_is_prvalue): Return true if the base subobject is part >>>>>>> of a temporary object. >>>>>> >>>>>> No, the base subobject of a prvalue is an xvalue. >>>>> >>>>> Ah, so this is just like T().m where T() is a prvalue but the whole thing >>>>> is an xvalue. Duly noted. >>>> >>>> Exactly. >>>> >>>>>> I think the problem is that an expression being a prvalue is a subset of >>>>>> binding a reference to a temporary, and we shouldn't try to express both of >>>>>> those using the same function: you need a separate >>>>>> conv_binds_ref_to_temporary. >>>>> >>>>> Ack, so how about this? Thanks, >>>>> >>>>> Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? >>>>> >>>>> -- >8 -- >>>>> This PR reports that >>>>> >>>>> struct Base {}; >>>>> struct Derived : Base {}; >>>>> static_assert(__reference_constructs_from_temporary(Base const&, Derived)); >>>>> >>>>> doesn't pass, which it should: it's just like >>>>> >>>>> const Base& b(Derived{}); >>>>> >>>>> where we bind 'b' to the Base subobject of a temporary object of type >>>>> Derived. The ck_base conversion didn't have ->need_temporary_p set because >>>>> we didn't need to create a temporary object just for the base, but the whole >>>>> object is a temporary so we're still binding to a temporary. Since the >>>>> Base subobject is an xvalue, a new function is introduced. >>>>> >>>>> PR c++/107085 >>>>> >>>>> gcc/cp/ChangeLog: >>>>> >>>>> * call.cc (conv_binds_ref_to_temporary): New. >>>>> (ref_conv_binds_directly): Use it. >>>>> >>>>> gcc/testsuite/ChangeLog: >>>>> >>>>> * g++.dg/ext/reference_constructs_from_temporary1.C: Adjust expected >>>>> result. >>>>> * g++.dg/ext/reference_converts_from_temporary1.C: Likewise. >>>>> * g++.dg/cpp0x/elision4.C: New test. >>>>> --- >>>>> gcc/cp/call.cc | 23 ++++++++++++++++++- >>>>> gcc/testsuite/g++.dg/cpp0x/elision4.C | 15 ++++++++++++ >>>>> .../reference_constructs_from_temporary1.C | 2 +- >>>>> .../ext/reference_converts_from_temporary1.C | 2 +- >>>>> 4 files changed, 39 insertions(+), 3 deletions(-) >>>>> create mode 100644 gcc/testsuite/g++.dg/cpp0x/elision4.C >>>>> >>>>> diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc >>>>> index bd04a1d309a..715a83f5a69 100644 >>>>> --- a/gcc/cp/call.cc >>>>> +++ b/gcc/cp/call.cc >>>>> @@ -9210,6 +9210,27 @@ conv_binds_ref_to_prvalue (conversion *c) >>>>> return conv_is_prvalue (next_conversion (c)); >>>>> } >>>>> +/* True iff C is a conversion that binds a reference to a temporary. >>>>> + This is a superset of conv_binds_ref_to_prvalue: here we're also >>>>> + interested in xvalues. */ >>>>> + >>>>> +static bool >>>>> +conv_binds_ref_to_temporary (conversion *c) >>>>> +{ >>>>> + if (conv_binds_ref_to_prvalue (c)) >>>>> + return true; >>>>> + if (c->kind != ck_ref_bind) >>>>> + return false; >>>>> + c = next_conversion (c); >>>>> + /* This is the case for >>>>> + struct Base {}; >>>>> + struct Derived : Base {}; >>>>> + const Base& b(Derived{}); >>>>> + where we bind 'b' to the Base subobject of a temporary object of type >>>>> + Derived. The subobject is an xvalue; the whole object is a prvalue. */ >>>>> + return (c->kind == ck_base && conv_is_prvalue (next_conversion (c))); >>>> >>>> I think you also want to check for the case of c->u.expr being a >>>> COMPONENT_REF/ARRAY_REF around a TARGET_EXPR, as you mentioned. >>> >>> I see. So this would be achieved using e.g. >>> >>> struct B { }; >>> struct D : B { }; >>> struct C { >>> D d; >>> }; >>> >>> const B& b = C{}.d; >> >> Yes. >> >>> Except I'm not sure how to trigger this via the built-in, which takes two types. >>> Am I missing something obvious? >> >> Indeed, it can't be triggered by the built-in. But I see >> ref_conv_binds_directly is also called from warn_for_range_copy, which ought >> to be able to trigger it. > > Even there, I think, it's not possible to trigger it with, say (d is an > array of D): > > for (const B &b : C{}.d) > // ... > > because warn_for_range_copy gets *__for_begin as the EXPR, which means that > we won't get to the TARGET_EXPR. It's like > > auto&& __for_begin = C{}.d; > const B &b = *__for_begin; > > and the conversion warn_for_range_copy sees is D -> const B -> const B&, the > original .u.expr is *__for_begin. Ah, right, and so the C{} temporary gets lifetime-extended and there's no problem to warn about. > I could add some checking assert to conv_binds_ref_to_temporary to see if > we ever encounter a COMPONENT_REF/ARRAY_REF around a TARGET_EXPR... Or try to handle it properly even if we can't exercise the code yet. I'm thinking again about warning for e.g. const B& b = frotz(C{}.d); where frotz passes through its reference argument, which becomes a dangling reference. Handling the C{}.d case seems relevant to such a warning. I wonder how many false positives there would be for warning about this for any function that both takes and returns a reference? Do you want to try that, or shall I? >> Incidentally, ref_conv_binds_directly should also probably be reversed to >> ref_conv_binds_to_temporary since you can "bind directly" to an xvalue that >> refers to a temporary. > > Good point, I at least did that. > > -- >8 -- > This PR reports that > > struct Base {}; > struct Derived : Base {}; > static_assert(__reference_constructs_from_temporary(Base const&, Derived)); > > doesn't pass, which it should: it's just like > > const Base& b(Derived{}); > > where we bind 'b' to the Base subobject of a temporary object of type > Derived. The ck_base conversion didn't have ->need_temporary_p set because > we didn't need to create a temporary object just for the base, but the whole > object is a temporary so we're still binding to a temporary. Since the > Base subobject is an xvalue, a new function is introduced. > > PR c++/107085 > > gcc/cp/ChangeLog: > > * call.cc (conv_binds_ref_to_temporary): New. > (ref_conv_binds_directly): Rename to... > (ref_conv_binds_to_temporary): ...this. Use > conv_binds_ref_to_temporary. > * cp-tree.h (ref_conv_binds_directly): Rename to... > (ref_conv_binds_to_temporary): ...this. > * method.cc (ref_xes_from_temporary): Use ref_conv_binds_to_temporary. > * parser.cc (warn_for_range_copy): Likewise. > > gcc/testsuite/ChangeLog: > > * g++.dg/ext/reference_constructs_from_temporary1.C: Adjust expected > result. > * g++.dg/ext/reference_converts_from_temporary1.C: Likewise. > * g++.dg/cpp0x/elision4.C: New test. > --- > gcc/cp/call.cc | 33 +++++++++++++++---- > gcc/cp/cp-tree.h | 2 +- > gcc/cp/method.cc | 2 +- > gcc/cp/parser.cc | 5 +-- > gcc/testsuite/g++.dg/cpp0x/elision4.C | 15 +++++++++ > .../reference_constructs_from_temporary1.C | 2 +- > .../ext/reference_converts_from_temporary1.C | 2 +- > 7 files changed, 49 insertions(+), 12 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/elision4.C > > diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc > index bd04a1d309a..5a3d509f6c8 100644 > --- a/gcc/cp/call.cc > +++ b/gcc/cp/call.cc > @@ -9210,15 +9210,36 @@ conv_binds_ref_to_prvalue (conversion *c) > return conv_is_prvalue (next_conversion (c)); > } > > -/* Return tristate::TS_TRUE if converting EXPR to a reference type TYPE does > - not involve creating a temporary. Return tristate::TS_FALSE if converting > - EXPR to a reference type TYPE binds the reference to a temporary. If the > - conversion is invalid or bad, return tristate::TS_UNKNOWN. DIRECT_INIT_P > +/* True iff C is a conversion that binds a reference to a temporary. > + This is a superset of conv_binds_ref_to_prvalue: here we're also > + interested in xvalues. */ > + > +static bool > +conv_binds_ref_to_temporary (conversion *c) > +{ > + if (conv_binds_ref_to_prvalue (c)) > + return true; > + if (c->kind != ck_ref_bind) > + return false; > + c = next_conversion (c); > + /* This is the case for > + struct Base {}; > + struct Derived : Base {}; > + const Base& b(Derived{}); > + where we bind 'b' to the Base subobject of a temporary object of type > + Derived. The subobject is an xvalue; the whole object is a prvalue. */ > + return (c->kind == ck_base && conv_is_prvalue (next_conversion (c))); > +} > + > +/* Return tristate::TS_TRUE if converting EXPR to a reference type TYPE binds > + the reference to a temporary. Return tristate::TS_FALSE if converting > + EXPR to a reference type TYPE doesn't bind the reference to a temporary. If > + the conversion is invalid or bad, return tristate::TS_UNKNOWN. DIRECT_INIT_P > says whether the conversion should be done in direct- or copy-initialization > context. */ > > tristate > -ref_conv_binds_directly (tree type, tree expr, bool direct_init_p /*= false*/) > +ref_conv_binds_to_temporary (tree type, tree expr, bool direct_init_p/*=false*/) > { > gcc_assert (TYPE_REF_P (type)); > > @@ -9230,7 +9251,7 @@ ref_conv_binds_directly (tree type, tree expr, bool direct_init_p /*= false*/) > /*c_cast_p=*/false, flags, tf_none); > tristate ret (tristate::TS_UNKNOWN); > if (conv && !conv->bad_p) > - ret = tristate (!conv_binds_ref_to_prvalue (conv)); > + ret = tristate (conv_binds_ref_to_temporary (conv)); > > /* Free all the conversions we allocated. */ > obstack_free (&conversion_obstack, p); > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index 8bc1c2dc7fd..469eb2fdb25 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -6534,7 +6534,7 @@ extern bool sufficient_parms_p (const_tree); > extern tree type_decays_to (tree); > extern tree extract_call_expr (tree); > extern tree build_trivial_dtor_call (tree, bool = false); > -extern tristate ref_conv_binds_directly (tree, tree, bool = false); > +extern tristate ref_conv_binds_to_temporary (tree, tree, bool = false); > extern tree build_user_type_conversion (tree, tree, int, > tsubst_flags_t); > extern tree build_new_function_call (tree, vec **, > diff --git a/gcc/cp/method.cc b/gcc/cp/method.cc > index 55af5c43c18..622e1b9802e 100644 > --- a/gcc/cp/method.cc > +++ b/gcc/cp/method.cc > @@ -2233,7 +2233,7 @@ ref_xes_from_temporary (tree to, tree from, bool direct_init_p) > tree val = build_stub_object (from); > if (!TYPE_REF_P (from) && TREE_CODE (from) != FUNCTION_TYPE) > val = CLASS_TYPE_P (from) ? force_rvalue (val, tf_none) : rvalue (val); > - return ref_conv_binds_directly (to, val, direct_init_p).is_false (); > + return ref_conv_binds_to_temporary (to, val, direct_init_p).is_true (); > } > > /* Worker for is_{,nothrow_}convertible. Attempt to perform an implicit > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index 90e06f914fb..bceedab5cd6 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -13731,7 +13731,8 @@ warn_for_range_copy (tree decl, tree expr) > > if (TYPE_REF_P (type)) > { > - if (glvalue_p (expr) && ref_conv_binds_directly (type, expr).is_false ()) > + if (glvalue_p (expr) > + && ref_conv_binds_to_temporary (type, expr).is_true ()) > { > auto_diagnostic_group d; > if (warning_at (loc, OPT_Wrange_loop_construct, > @@ -13762,7 +13763,7 @@ warn_for_range_copy (tree decl, tree expr) > /* If we can initialize a reference directly, suggest that to avoid the > copy. */ > tree rtype = cp_build_reference_type (type, /*rval*/false); > - if (ref_conv_binds_directly (rtype, expr).is_true ()) > + if (ref_conv_binds_to_temporary (rtype, expr).is_false ()) > { > auto_diagnostic_group d; > if (warning_at (loc, OPT_Wrange_loop_construct, > diff --git a/gcc/testsuite/g++.dg/cpp0x/elision4.C b/gcc/testsuite/g++.dg/cpp0x/elision4.C > new file mode 100644 > index 00000000000..3cc2e3afa5d > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/elision4.C > @@ -0,0 +1,15 @@ > +// PR c++/107085 > +// { dg-do compile { target c++11 } } > + > +struct X { > + X(); > + X(X&&); > +}; > +struct Z : X {}; > +X x1 = Z(); > +X x2 = X(Z()); > + > +struct B { }; > +struct D : B { }; > +B b1 = D(); > +B b2 = B(D()); > diff --git a/gcc/testsuite/g++.dg/ext/reference_constructs_from_temporary1.C b/gcc/testsuite/g++.dg/ext/reference_constructs_from_temporary1.C > index 76de905a35d..5354b1dc4e6 100644 > --- a/gcc/testsuite/g++.dg/ext/reference_constructs_from_temporary1.C > +++ b/gcc/testsuite/g++.dg/ext/reference_constructs_from_temporary1.C > @@ -201,7 +201,7 @@ SA(!__reference_constructs_from_temporary(const int&, H)); > SA(!__reference_constructs_from_temporary(int&&, G2)); > SA(!__reference_constructs_from_temporary(const int&, H2)); > > -SA(!__reference_constructs_from_temporary(const Base&, Der)); > +SA(__reference_constructs_from_temporary(const Base&, Der)); > > // This fails because std::is_constructible_v> is false. > SA(!__reference_constructs_from_temporary(int&&, id)); > diff --git a/gcc/testsuite/g++.dg/ext/reference_converts_from_temporary1.C b/gcc/testsuite/g++.dg/ext/reference_converts_from_temporary1.C > index 90196c38742..e6c159e9b00 100644 > --- a/gcc/testsuite/g++.dg/ext/reference_converts_from_temporary1.C > +++ b/gcc/testsuite/g++.dg/ext/reference_converts_from_temporary1.C > @@ -201,7 +201,7 @@ SA( __reference_converts_from_temporary(const int&, H)); > SA(!__reference_converts_from_temporary(int&&, G2)); > SA(!__reference_converts_from_temporary(const int&, H2)); > > -SA(!__reference_converts_from_temporary(const Base&, Der)); > +SA(__reference_converts_from_temporary(const Base&, Der)); > > // This fails because std::is_constructible_v> is false. > SA(!__reference_converts_from_temporary(int&&, id)); > > base-commit: 50c35c691517291dbb77b1661761bc59950ba101