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 52F6C3858D32 for ; Mon, 14 Nov 2022 23:29:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52F6C3858D32 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=1668468587; 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=z+btTVugihgVSqk+3E0OvYHj/Mt4pWE5kziN0Vgz2+M=; b=GnxbQtcpdaZh6mf5TcsvoSOqUBgr7E7xWRCa8wri5rBo2gC2AkI3Vydb2sQARGuzLDaBth d48wfDudjQvtqlGUgQQviPkrTpwVvwalkQFD+o0uI+qbsT18EF4/9OhorsZsCtPTk0BH1v zByojuOBTYeCeFdQn1hFuyNRcBDRIJU= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-336-cJv_gUjRPsWzZiOaUxB_VQ-1; Mon, 14 Nov 2022 18:29:46 -0500 X-MC-Unique: cJv_gUjRPsWzZiOaUxB_VQ-1 Received: by mail-qk1-f197.google.com with SMTP id w4-20020a05620a444400b006fa24b2f394so12216039qkp.15 for ; Mon, 14 Nov 2022 15:29:46 -0800 (PST) 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=z+btTVugihgVSqk+3E0OvYHj/Mt4pWE5kziN0Vgz2+M=; b=CpTUCsfZ5XUCYhmFPFMdpGZpSL1L2JPccFdLtepMl01cjLqnAho1j+t7+79akpm7Ah ZS/waYG93T7avx/YiO6ryCZYwpaLcoJ+AILo6qdql/JENN/wfmMYean+/5cqxHgjHBlC odArybXpTUrp4/QMKkITXED7oRB8jxaiVUTP3I99BLUPi3W+DBw9VoGa0UDUHeN7KSOP gS9WKirfLDHdTkfREX7rKE20D5T7Zc95v/womSgt7ewCzsj24pIpsOfPcv+9JKE2XunE QjK8/q0AZliNPzpTYEChXVaGO7VMzJno7flsnZ31mMJMZHeONNocMEqWTdTIZYgNRLij C0fA== X-Gm-Message-State: ANoB5pnrj/r9FN7EEn6cS+PCIMHSQzAyLN1VXDEdQ+npR+uDx1mqpwcU lJ5mBW/qzQbaVP3T4gFxcvtU+4y9Ot7KhUaBHvAlhz44hesdjW7Ln4cO1Au1nUnahJR1T2srTwj E3L5ZYxpIfJ8IMASetw== X-Received: by 2002:a05:6214:b87:b0:4bb:5fa3:6426 with SMTP id fe7-20020a0562140b8700b004bb5fa36426mr14286806qvb.18.1668468586270; Mon, 14 Nov 2022 15:29:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf4S65WnPBpZ7zFgy4EkiFddPHSFTIVT9IlI7mEvUfJLtgnlGMznK6wQUfmhLP56mAvA69EESA== X-Received: by 2002:a05:6214:b87:b0:4bb:5fa3:6426 with SMTP id fe7-20020a0562140b8700b004bb5fa36426mr14286790qvb.18.1668468585794; Mon, 14 Nov 2022 15:29:45 -0800 (PST) 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 w15-20020a05620a424f00b006fa4cac54a4sm7246710qko.133.2022.11.14.15.29.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 15:29:45 -0800 (PST) Message-ID: <1ec099de-4247-29ec-0e06-602a90370388@redhat.com> Date: Mon, 14 Nov 2022 18:29:44 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH] c++: Implement C++23 P2589R1 - - static operator[] To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org References: 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=-6.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 11/10/22 21:40, Jakub Jelinek wrote: > Hi! > > As stage1 is very close, here is a patch that implements the static > operator[] paper. > One thing that doesn't work properly is the same problem as I've filed > yesterday for static operator() - PR107624 - that side-effects of > the postfix-expression on which the call or subscript operator are > applied are thrown away, I assume we have to add them into COMPOUND_EXPR > somewhere after we find out that the we've chosen a static member function > operator. Indeed. The code in build_new_method_call for this case has the comment /* In an expression of the form `a->f()' where `f' turns out to be a static member function, `a' is none-the-less evaluated. */ > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk > provided the paper gets voted into C++23? OK. > 2022-11-11 Jakub Jelinek > > gcc/c-family/ > * c-cppbuiltin.cc (c_cpp_builtins): Bump C++23 > __cpp_multidimensional_subscript macro value to 202211L. > gcc/cp/ > * decl.cc (grok_op_properties): Implement C++23 P2589R1 > - static operator[]. Handle operator[] similarly to operator() > - allow static member functions, but pedwarn on it for C++20 and > older. Unlike operator(), perform rest of checks on it though for > C++20. > * call.cc (add_operator_candidates): For operator[] with class > typed first parameter, pass that parameter as first_arg and > an adjusted arglist without that parameter. > gcc/testsuite/ > * g++.dg/cpp23/subscript9.C: New test. > * g++.dg/cpp23/feat-cxx2b.C: Expect a newer > __cpp_multidimensional_subscript value. > * g++.old-deja/g++.bugs/900210_10.C: Don't expect an error > for C++23 or later. > > --- gcc/c-family/c-cppbuiltin.cc.jj 2022-10-14 09:35:56.182990495 +0200 > +++ gcc/c-family/c-cppbuiltin.cc 2022-11-10 22:29:12.539832741 +0100 > @@ -1075,7 +1075,7 @@ c_cpp_builtins (cpp_reader *pfile) > cpp_define (pfile, "__cpp_size_t_suffix=202011L"); > cpp_define (pfile, "__cpp_if_consteval=202106L"); > cpp_define (pfile, "__cpp_constexpr=202110L"); > - cpp_define (pfile, "__cpp_multidimensional_subscript=202110L"); > + cpp_define (pfile, "__cpp_multidimensional_subscript=202211L"); > cpp_define (pfile, "__cpp_named_character_escapes=202207L"); > cpp_define (pfile, "__cpp_static_call_operator=202207L"); > cpp_define (pfile, "__cpp_implicit_move=202207L"); > --- gcc/cp/decl.cc.jj 2022-11-08 09:54:37.313400209 +0100 > +++ gcc/cp/decl.cc 2022-11-10 21:26:06.891359343 +0100 > @@ -15377,7 +15377,15 @@ grok_op_properties (tree decl, bool comp > an enumeration, or a reference to an enumeration. 13.4.0.6 */ > if (! methodp || DECL_STATIC_FUNCTION_P (decl)) > { > - if (operator_code == CALL_EXPR) > + if (operator_code == TYPE_EXPR > + || operator_code == COMPONENT_REF > + || operator_code == NOP_EXPR) > + { > + error_at (loc, "%qD must be a non-static member function", decl); > + return false; > + } > + > + if (operator_code == CALL_EXPR || operator_code == ARRAY_REF) > { > if (! DECL_STATIC_FUNCTION_P (decl)) > { > @@ -15386,52 +15394,41 @@ grok_op_properties (tree decl, bool comp > } > if (cxx_dialect < cxx23 > /* For lambdas we diagnose static lambda specifier elsewhere. */ > - && ! LAMBDA_FUNCTION_P (decl) > + && (operator_code == ARRAY_REF || ! LAMBDA_FUNCTION_P (decl)) > /* For instantiations, we have diagnosed this already. */ > && ! DECL_USE_TEMPLATE (decl)) > pedwarn (loc, OPT_Wc__23_extensions, "%qD may be a static member " > - "function only with %<-std=c++23%> or %<-std=gnu++23%>", decl); > - /* There are no further restrictions on the arguments to an > - overloaded "operator ()". */ > - return true; > - } > - if (operator_code == TYPE_EXPR > - || operator_code == COMPONENT_REF > - || operator_code == ARRAY_REF > - || operator_code == NOP_EXPR) > - { > - error_at (loc, "%qD must be a non-static member function", decl); > - return false; > + "function only with %<-std=c++23%> or %<-std=gnu++23%>", > + decl); > } > - > - if (DECL_STATIC_FUNCTION_P (decl)) > + else if (DECL_STATIC_FUNCTION_P (decl)) > { > error_at (loc, "%qD must be either a non-static member " > "function or a non-member function", decl); > return false; > } > - > - for (tree arg = argtypes; ; arg = TREE_CHAIN (arg)) > - { > - if (!arg || arg == void_list_node) > - { > - if (complain) > - error_at(loc, "%qD must have an argument of class or " > - "enumerated type", decl); > - return false; > - } > + else > + for (tree arg = argtypes; ; arg = TREE_CHAIN (arg)) > + { > + if (!arg || arg == void_list_node) > + { > + if (complain) > + error_at (loc, "%qD must have an argument of class or " > + "enumerated type", decl); > + return false; > + } > > - tree type = non_reference (TREE_VALUE (arg)); > - if (type == error_mark_node) > - return false; > - > - /* MAYBE_CLASS_TYPE_P, rather than CLASS_TYPE_P, is used > - because these checks are performed even on template > - functions. */ > - if (MAYBE_CLASS_TYPE_P (type) > - || TREE_CODE (type) == ENUMERAL_TYPE) > - break; > - } > + tree type = non_reference (TREE_VALUE (arg)); > + if (type == error_mark_node) > + return false; > + > + /* MAYBE_CLASS_TYPE_P, rather than CLASS_TYPE_P, is used > + because these checks are performed even on template > + functions. */ > + if (MAYBE_CLASS_TYPE_P (type) > + || TREE_CODE (type) == ENUMERAL_TYPE) > + break; > + } > } > > if (operator_code == CALL_EXPR) > --- gcc/cp/call.cc.jj 2022-11-08 09:54:37.283400616 +0100 > +++ gcc/cp/call.cc 2022-11-10 22:26:38.096936491 +0100 > @@ -6589,12 +6589,36 @@ add_operator_candidates (z_candidate **c > if (fns == error_mark_node) > return error_mark_node; > if (fns) > - add_candidates (BASELINK_FUNCTIONS (fns), > - NULL_TREE, arglist, NULL_TREE, > - NULL_TREE, false, > - BASELINK_BINFO (fns), > - BASELINK_ACCESS_BINFO (fns), > - flags, candidates, complain); > + { > + if (code == ARRAY_REF) > + { > + vec *restlist = make_tree_vector (); > + for (unsigned i = 1; i < nargs; ++i) > + vec_safe_push (restlist, (*arglist)[i]); > + z_candidate *save_cand = *candidates; > + add_candidates (BASELINK_FUNCTIONS (fns), > + (*arglist)[0], restlist, NULL_TREE, > + NULL_TREE, false, > + BASELINK_BINFO (fns), > + BASELINK_ACCESS_BINFO (fns), > + flags, candidates, complain); > + /* Release the vec if we didn't add a candidate that uses it. */ > + for (z_candidate *c = *candidates; c != save_cand; c = c->next) > + if (c->args == restlist) > + { > + restlist = NULL; > + break; > + } > + release_tree_vector (restlist); > + } > + else > + add_candidates (BASELINK_FUNCTIONS (fns), > + NULL_TREE, arglist, NULL_TREE, > + NULL_TREE, false, > + BASELINK_BINFO (fns), > + BASELINK_ACCESS_BINFO (fns), > + flags, candidates, complain); > + } > } > /* Per [over.match.oper]3.2, if no operand has a class type, then > only non-member functions that have type T1 or reference to > --- gcc/testsuite/g++.dg/cpp23/subscript9.C.jj 2022-11-10 21:06:58.155974655 +0100 > +++ gcc/testsuite/g++.dg/cpp23/subscript9.C 2022-11-11 08:26:26.502445107 +0100 > @@ -0,0 +1,29 @@ > +// P2589R1 > +// { dg-do run { target c++23 } } > + > +extern "C" void abort (); > + > +struct S > +{ > + S () {}; > + static int &operator[] () { return a[0]; } > + static int &operator[] (int x) { return a[x]; } > + static int &operator[] (int x, long y) { return a[x + y * 8]; } > + static int a[64]; > +}; > +int S::a[64]; > + > +int > +main () > +{ > + S s; > + for (int i = 0; i < 64; i++) > + s.a[i] = 64 - i; > + if (s[] != 64 || s[3] != 61 || s[4, 5] != 20) > + abort (); > + s[]++; > + s[42]++; > + ++s[3, 2]; > + if (s.a[0] != 65 || s.a[42] != 23 || s.a[19] != 46) > + abort (); > +} > --- gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C.jj 2022-10-06 08:56:28.785125656 +0200 > +++ gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C 2022-11-10 22:31:49.187698955 +0100 > @@ -556,8 +556,8 @@ > > #ifndef __cpp_multidimensional_subscript > # error "__cpp_multidimensional_subscript" > -#elif __cpp_multidimensional_subscript != 202110 > -# error "__cpp_multidimensional_subscript != 202110" > +#elif __cpp_multidimensional_subscript != 202211 > +# error "__cpp_multidimensional_subscript != 202211" > #endif > > #ifndef __cpp_named_character_escapes > --- gcc/testsuite/g++.old-deja/g++.bugs/900210_10.C.jj 2020-01-14 20:02:47.021606269 +0100 > +++ gcc/testsuite/g++.old-deja/g++.bugs/900210_10.C 2022-11-11 01:41:13.840971578 +0100 > @@ -9,7 +9,7 @@ > // keywords: operator[], static function members > > struct struct0 { > - static int operator[] (); /* { dg-error "" } */ > + static int operator[] (); /* { dg-error "" "" { target c++20_down } } */ > }; > > int main () { return 0; } > > Jakub >