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 8B4363858404 for ; Mon, 13 Feb 2023 17:23:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B4363858404 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=1676309033; 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=Omwcuh0Zsf0KcNd8TtQrGbwjDlqE6UXVJ0E85E55d/g=; b=aThBBMrA4lyqF0UfmRfvjIxPuHRrbmBOv1c1D76qb0Xgx5+5yLCYPQobgUTR7AELhqctjG laoo3Szdfqny3f+/G/g8wWdmz0Z35LQRDya4B+sCRUYOgo6TTnURVT+BpwkXtbZ01VdQnw lTppPJqROf0B+H21lgc0VQK9ObqHwEA= 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-314-pAKgOw3wMpyS6Qu7_Kq-fA-1; Mon, 13 Feb 2023 12:23:50 -0500 X-MC-Unique: pAKgOw3wMpyS6Qu7_Kq-fA-1 Received: by mail-qv1-f72.google.com with SMTP id ob12-20020a0562142f8c00b004c6c72bf1d0so7106482qvb.9 for ; Mon, 13 Feb 2023 09:23:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Omwcuh0Zsf0KcNd8TtQrGbwjDlqE6UXVJ0E85E55d/g=; b=SIKmo7xQQSlXoyeX1qlejizPAhCNdh5SqTlHTlt/necbkN9dS0jmME/6IdT1gZYVXX FDj5QQKqVDVKlhl0SVqzGkXXNkbcLveevRHLY5yKNoWVReycVZzVb+R/90kx4XuGvtDV 9jwth4a53hg8TZnncMWEoBffnU27J70tH7WzOJRMiv7Z/j1zg6ADYBNqWaMygCgHKErI 0Eeh14Cwf1Cm8+es8Ifqh6QHNjf/vCqROP1edwJEC+xr6CNCL/043/vgZA+lBYVMfp+h 2lRNoAZvzKYRPeeg4qFlr5zPeNIASMtiDscf0VvKAhcpGbuaJHkk860Hj39PryoBkn2R 4cyA== X-Gm-Message-State: AO0yUKXiKpBP9cVR8hDm+TVjBhMRlObfm11YYxDAsxfQ+6PxlJhuEHbf U+cDLj1YnENJgWxf4A9+AlnDewEX7MMALoN6z0GTfAEz4X5NRAxAMAnWH5n5033vV3nIQXxkjru q6khcqHbid510vIbmBWHpxf4vP6oQ9UuOT6JzhP6g3Ipck+jQUWafBUSpf6gCXWlux6NtWAnd X-Received: by 2002:ac8:57d5:0:b0:3b8:2077:1421 with SMTP id w21-20020ac857d5000000b003b820771421mr46379667qta.32.1676309029174; Mon, 13 Feb 2023 09:23:49 -0800 (PST) X-Google-Smtp-Source: AK7set8XRe3Gx2/0EykTpHM9PO3gusUGJg+kt99g6Svm/zWeEeuC/ZiOgqMC5m3jXXl4JNCaTk5gYg== X-Received: by 2002:ac8:57d5:0:b0:3b8:2077:1421 with SMTP id w21-20020ac857d5000000b003b820771421mr46379612qta.32.1676309028695; Mon, 13 Feb 2023 09:23:48 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id r142-20020a37a894000000b00729a26e836esm10198797qke.84.2023.02.13.09.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 09:23:47 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH 2/2] c++: TYPENAME_TYPE lookup ignoring non-types [PR107773] Date: Mon, 13 Feb 2023 12:23:40 -0500 Message-Id: <20230213172340.849204-2-ppalka@redhat.com> X-Mailer: git-send-email 2.39.1.433.g23c56f7bd5 In-Reply-To: <20230213172340.849204-1-ppalka@redhat.com> References: <20230213172340.849204-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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,KAM_SHORT,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: [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); 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 } +} -- 2.39.1.433.g23c56f7bd5