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 436693858C1F for ; Tue, 14 Feb 2023 22:16:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 436693858C1F 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=1676412976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YEudY2rHUeiIps9L58Ck9fEhXWsIB6azjZ15LeLsfbw=; b=JkyGJseFyyYBkiWTZcbVd9LHAaQ1j7TIC83MFz6vOSsLiZdqOf8kmk/Quj+PWYEUl5dTk+ KFAgYZtJtUCtt5b7lss5hudgdSpahXUGHqSiTmHSyHEY+BVjFJ7Pap66nBuWso5kVNC1fs 9hMnzSQ4aSkyexshozIXgvFn39cvoGQ= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-157-Mf9w4lZkOo-rdmKid8U1Nw-1; Tue, 14 Feb 2023 17:16:13 -0500 X-MC-Unique: Mf9w4lZkOo-rdmKid8U1Nw-1 Received: by mail-qv1-f69.google.com with SMTP id f6-20020a0cc306000000b0056e96f4fd64so7026619qvi.15 for ; Tue, 14 Feb 2023 14:16:12 -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: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=YEudY2rHUeiIps9L58Ck9fEhXWsIB6azjZ15LeLsfbw=; b=mcQO7sb9Fig8e7IXsk0pHDmD7JytEBn2ArIJSMIUICJz7w5DpaFUndGIvp9QAivdL4 UktPIlvatKk0WlsG9vrDXakqe0V08JePEac3xw3GsW5fvycYKEcuIJPN31aSJKLLwp3u 0R8BO8xN6N/raMcnUiM3GZjWXLLq3X7Q4B1aMGtmwb6IrZQDV9f9JP+eyLO5FicTs3DB sfpgfJG+4tp5hO6v7lGaZF0AnOpCsx/txUzukVQc0rC8DyfzscVl6YYdfRd63iqyTm6m j4BQJpWIAVBHCj8Y+96UmXTbPr72LhTvFEiNQuVKoqTTvamR/1PQ1MRKuAckt2Eq0/PM EPVg== X-Gm-Message-State: AO0yUKW4+eduG3TUu+hze1cKKaZpwzYgLSthnqfBwwAEk/UzsH5vewLv izZ8qIni8PN+S4C/S5IkCmVIR8wVfsYnJRTIX05rtJqvzZkD2cRNcLdAH6seLJres27Zt5oS4Cv /NRwiNnqTFwmRmPA7gw== X-Received: by 2002:ac8:7f54:0:b0:3b9:cd2a:f13d with SMTP id g20-20020ac87f54000000b003b9cd2af13dmr7252773qtk.59.1676412972238; Tue, 14 Feb 2023 14:16:12 -0800 (PST) X-Google-Smtp-Source: AK7set/E3wbT9GPQbCG5ahHiAggz8ywKgvee44sw3tskBQeB+hmdSo26SJMog8lTlkhPlzTRPBIyfg== X-Received: by 2002:ac8:7f54:0:b0:3b9:cd2a:f13d with SMTP id g20-20020ac87f54000000b003b9cd2af13dmr7252734qtk.59.1676412971769; Tue, 14 Feb 2023 14:16:11 -0800 (PST) Received: from [192.168.1.108] (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 a191-20020ae9e8c8000000b0072396cb73cdsm12530845qkg.13.2023.02.14.14.16.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Feb 2023 14:16:11 -0800 (PST) Message-ID: Date: Tue, 14 Feb 2023 17:16:09 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH 2/2] c++: TYPENAME_TYPE lookup ignoring non-types [PR107773] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20230213172340.849204-1-ppalka@redhat.com> <20230213172340.849204-2-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20230213172340.849204-2-ppalka@redhat.com> 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.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,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 2/13/23 09:23, Patrick Palka wrote: > [N.B. this is a corrected version of > https://gcc.gnu.org/pipermail/gcc-patches/2022-November/607443.html ] > > Currently when resolving a TYPENAME_TYPE for 'typename T::m' via > make_typename_type, we consider only type bindings of 'm' and ignore > non-type ones. But [temp.res.general]/3 says, in a note, "the usual > qualified name lookup ([basic.lookup.qual]) applies even in the presence > of 'typename'", and qualified name lookup doesn't discriminate between > type and non-type bindings. So when resolving such a TYPENAME_TYPE > we want the lookup to consider all bindings. > > An exception is when we have a TYPENAME_TYPE corresponding to the > qualifying scope appearing before the :: scope resolution operator, such > as 'T::type' in 'typename T::type::m'. In that case, [basic.lookup.qual]/1 > applies, and lookup for such a TYPENAME_TYPE must ignore non-type > bindings. So in order to correctly handle all cases, make_typename_type > needs an additional flag controlling whether lookup should ignore > non-types or not. > > To that end this patch adds a type_only flag to make_typename_type and > defaults it to false (do not ignore non-types). In contexts where we do > want to ignore non-types (when substituting into the scope of a > TYPENAME_TYPE, SCOPE_REF, USING_DECL) we call tsubst_typename_type > directly with type_only=true. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? > > PR c++/107773 > > gcc/cp/ChangeLog: > > * cp-tree.h (make_typename_type): Add another boolean parameter > that defaults to false. > * decl.cc (make_typename_type): Use lookup_member instead of > lookup_field. Pass want_type=type_only instead of =false to > lookup_member. Generalize format specifier in diagnostic to > handle both type and non-type bindings. > * pt.cc (tsubst_typename_type): Add another boolean parameter > that defaults to false and pass it to make_typename_type. If > TYPE_CONTEXT is a TYPENAME_TYPE recurse with type_only=true > instead of substituting it via tsubst. > (tsubst_decl) : If the scpoe is a TYPENAME_TYPE > call tsubst_typename_type directly with type_only=true instead > of substituting it via tsubst. > (tsubst_qualified_id): Likewise. > * search.cc (lookup_member): Document default argument. > > gcc/testsuite/ChangeLog: > > * g++.dg/template/typename24.C: New test. > * g++.dg/template/typename25.C: New test. > * g++.dg/template/typename26.C: New test. > --- > gcc/cp/cp-tree.h | 2 +- > gcc/cp/decl.cc | 14 ++++----- > gcc/cp/pt.cc | 24 +++++++++++---- > gcc/cp/search.cc | 2 +- > gcc/testsuite/g++.dg/template/typename24.C | 18 ++++++++++++ > gcc/testsuite/g++.dg/template/typename25.C | 34 ++++++++++++++++++++++ > gcc/testsuite/g++.dg/template/typename26.C | 20 +++++++++++++ > 7 files changed, 100 insertions(+), 14 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/template/typename24.C > create mode 100644 gcc/testsuite/g++.dg/template/typename25.C > create mode 100644 gcc/testsuite/g++.dg/template/typename26.C > > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index a7c5765fc33..1241dbf8037 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -6845,7 +6845,7 @@ extern tree define_label (location_t, tree); > extern void check_goto (tree); > extern bool check_omp_return (void); > extern tree make_typename_type (tree, tree, enum tag_types, tsubst_flags_t, > - bool = false, bool = false); > + bool = false, bool = false, bool = false); > extern tree build_typename_type (tree, tree, tree, tag_types); > extern tree make_unbound_class_template (tree, tree, tree, tsubst_flags_t); > extern tree make_unbound_class_template_raw (tree, tree, tree); > diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc > index 430533606b0..c741dc23d99 100644 > --- a/gcc/cp/decl.cc > +++ b/gcc/cp/decl.cc > @@ -4232,13 +4232,14 @@ build_typename_type (tree context, tree name, tree fullname, > return that, rather than the _TYPE it corresponds to, in other > cases we look through the type decl. If TEMPLATE_OK is true and > we found a TEMPLATE_DECL then we return a CTAD placeholder for the > - TEMPLATE_DECL. If TF_ERROR is set, complain about errors, otherwise > - be quiet. */ > + TEMPLATE_DECL. If TYPE_ONLY is true, lookup of NAME in CONTEXT > + ignores non-type bindings. If TF_ERROR is set, complain about errors, > + otherwise be quiet. */ > > tree > make_typename_type (tree context, tree name, enum tag_types tag_type, > tsubst_flags_t complain, bool keep_type_decl /* = false */, > - bool template_ok /* = false */) > + bool template_ok /* = false */, bool type_only /* = false */) > { > tree fullname; > tree t; > @@ -4308,9 +4309,8 @@ make_typename_type (tree context, tree name, enum tag_types tag_type, > member of the current instantiation or a non-dependent base; > lookup will stop when we hit a dependent base. */ > if (!dependent_scope_p (context)) > - /* We should only set WANT_TYPE when we're a nested typename type. > - Then we can give better diagnostics if we find a non-type. */ > - t = lookup_field (context, name, 2, /*want_type=*/true); > + t = lookup_member (context, name, /*protect=*/2, > + /*want_type=*/type_only, complain); > else > t = NULL_TREE; > > @@ -4362,7 +4362,7 @@ make_typename_type (tree context, tree name, enum tag_types tag_type, > else > { > if (complain & tf_error) > - error ("% names %q#T, which is not a type", > + error ("% names %q#D, which is not a type", > context, name, t); > return error_mark_node; > } > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index bc47bf15d38..27fc0b93484 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -13949,12 +13949,12 @@ tsubst_aggr_type_1 (tree t, > return t; > } > > -/* Substitute ARGS into the TYPENAME_TYPE T. The flag TEMPLATE_OK > - is passed to make_typename_type. */ > +/* Substitute ARGS into the TYPENAME_TYPE T. The flags TEMPLATE_OK and > + TYPE_ONLY are passed to make_typename_type. */ > > static tree > tsubst_typename_type (tree t, tree args, tsubst_flags_t complain, tree in_decl, > - bool template_ok = false) > + bool template_ok = false, bool type_only = false) > { > tree ctx = TYPE_CONTEXT (t); > if (TREE_CODE (ctx) == TYPE_PACK_EXPANSION) > @@ -13972,6 +13972,10 @@ tsubst_typename_type (tree t, tree args, tsubst_flags_t complain, tree in_decl, > } > ctx = TREE_VEC_ELT (ctx, 0); > } > + else if (TREE_CODE (ctx) == TYPENAME_TYPE > + && !typedef_variant_p (ctx)) > + ctx = tsubst_typename_type (ctx, args, complain, in_decl, > + /*template_ok=*/false, /*type_only=*/true); > else > ctx = tsubst_aggr_type (ctx, args, complain, in_decl, > /*entering_scope=*/1); > @@ -14004,7 +14008,7 @@ tsubst_typename_type (tree t, tree args, tsubst_flags_t complain, tree in_decl, > } > > f = make_typename_type (ctx, f, typename_type, complain, > - /*keep_type_decl=*/true, template_ok); > + /*keep_type_decl=*/true, template_ok, type_only); > if (f == error_mark_node) > return f; > if (TREE_CODE (f) == TYPE_DECL) > @@ -15094,6 +15098,11 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) > scope = tsubst_pack_expansion (scope, args, complain, in_decl); > variadic_p = true; > } > + else if (TREE_CODE (scope) == TYPENAME_TYPE > + && !typedef_variant_p (scope)) > + scope = tsubst_typename_type (scope, args, complain, in_decl, > + /*template_ok=*/false, > + /*type_only=*/true); > else > scope = tsubst_copy (scope, args, complain, in_decl); > > @@ -16885,7 +16894,12 @@ tsubst_qualified_id (tree qualified_id, tree args, > scope = TREE_OPERAND (qualified_id, 0); > if (args) > { > - scope = tsubst (scope, args, complain, in_decl); > + if (TREE_CODE (scope) == TYPENAME_TYPE > + && !typedef_variant_p (scope)) > + scope = tsubst_typename_type (scope, args, complain, in_decl, > + /*template_ok=*/false, /*type_only=*/true); > + else > + scope = tsubst (scope, args, complain, in_decl); Maybe we want a tsubst_scope function? > expr = tsubst_copy (name, args, complain, in_decl); > } > else > diff --git a/gcc/cp/search.cc b/gcc/cp/search.cc > index f3f19cafec6..e472a97679d 100644 > --- a/gcc/cp/search.cc > +++ b/gcc/cp/search.cc > @@ -1109,7 +1109,7 @@ build_baselink (tree binfo, tree access_binfo, tree functions, tree optype) > > tree > lookup_member (tree xbasetype, tree name, int protect, bool want_type, > - tsubst_flags_t complain, access_failure_info *afi) > + tsubst_flags_t complain, access_failure_info *afi /* = NULL */) > { > tree rval, rval_binfo = NULL_TREE; > tree type = NULL_TREE, basetype_path = NULL_TREE; > diff --git a/gcc/testsuite/g++.dg/template/typename24.C b/gcc/testsuite/g++.dg/template/typename24.C > new file mode 100644 > index 00000000000..8b2b3718442 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/template/typename24.C > @@ -0,0 +1,18 @@ > +// PR c++/107773 > +// Verify lookup for a non-neste TYPENAME_TYPE correctly considers > +// non-types. > + > +struct a { > + typedef void get; > +}; > + > +struct b : a { > + int get(int i) const; > +}; > + > +template > +void f() { > + typedef typename T::get type; // { dg-error "'int b::get\\(int\\) const', which is not a type" } > +} > + > +template void f(); > diff --git a/gcc/testsuite/g++.dg/template/typename25.C b/gcc/testsuite/g++.dg/template/typename25.C > new file mode 100644 > index 00000000000..924330ee8d4 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/template/typename25.C > @@ -0,0 +1,34 @@ > +// PR c++/107773 > +// Verify lookup for TYPENAME_TYPE appearing to the left of the scope (::) > +// operator in various contexts correctly ignores non-types. > + > +struct a { > + typedef void type; > +}; > + > +struct c { > + struct b : a { > + typedef b self; > + static int m; > + }; > + int b; > +}; > + > +template > +void f() { > + // T::b::type is a TYPENAME_TYPE whose TYPE_CONTEXT is a nested > + // TYPENAME_TYPE. > + typedef typename T::b::type type; > + // T::b::m is a SCOPE_REF whose first operand is a TYPENAME_TYPE. > + int m = T::b::m; > +} > + > +template void f(); > + > +template > +struct d : T::b::self { > + // The using is a USING_DECL whose USING_DECL_SCOPE is a TYPENAME_TYPE. > + using typename T::b::type; > +}; > + > +template struct d; > diff --git a/gcc/testsuite/g++.dg/template/typename26.C b/gcc/testsuite/g++.dg/template/typename26.C > new file mode 100644 > index 00000000000..4e6b764a97b > --- /dev/null > +++ b/gcc/testsuite/g++.dg/template/typename26.C > @@ -0,0 +1,20 @@ > +// Example 4 from [temp.res.general]/3. > + > +struct A { > + struct X { }; > + int X; > +}; > +struct B { > + struct X { }; > +}; > +template void f(T t) { > + typename T::X x; // { dg-error "'int A::X', which is not a type" } > +} > +void foo() { > + A a; > + B b; > + f(b); // OK, T::X refers to B::X > + // { dg-bogus "" "" { target *-*-* } .-1 } > + f(a); // error: T::X refers to the data member A::X not the struct A::X > + // { dg-message "required from here" "" { target *-*-* } .-1 } > +}