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 1E2FF385B523 for ; Fri, 17 Mar 2023 15:44:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E2FF385B523 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=1679067853; 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: in-reply-to:in-reply-to:references:references; bh=iyOeY1eoFUIQkd/Wgjy05Yk/ICJ1hBc6MVJox7LO0Ac=; b=gWf89kUM6b+mB9H+doEY9auD5dRORRZITT8uceyAVWhqnZYJl0nR/uY3ajb6+ruSLmg+5X +0OoBTqhFSrcG1KfoaqcORXplhXqU1yUENINg+p9U5KndhXoJjiRSp9bui4Y5QAPYDbskB Srhw8HpWvEXCmH3nI8BNLp/7xrYWqFA= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-7p1vRSGdOsiP3x0kq6UJBQ-1; Fri, 17 Mar 2023 11:44:12 -0400 X-MC-Unique: 7p1vRSGdOsiP3x0kq6UJBQ-1 Received: by mail-qt1-f197.google.com with SMTP id o10-20020a05622a138a00b003bfdabf3b89so2725034qtk.13 for ; Fri, 17 Mar 2023 08:44:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679067851; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iyOeY1eoFUIQkd/Wgjy05Yk/ICJ1hBc6MVJox7LO0Ac=; b=RCO/NerwplyCkiJNmBBajJ85HBuZEEKWXKmqYHeyI9rjk1xofDqdtb4VxUIeQhIARX 6iAD016Sga+hEnhdLk6P/LhHUKTxeCfqUXeKAV27nfjhul/O6bmCxtq3hD5B6mxeA3lc TuwGFXku3U8Ry+IZ4voUmPF0WGTYx7dcciesz/rZP/FztiksRVx9s4cEuydLVexI3ofT 2H9hNO+fD6V7rhXnyLGulkv2wUvZCwTPHpOTYEKdaklZMaY8w6BEb4t+6CyGT8FhrG5q vX0NfSr1+lHpdTLEyLVm+GWByFZA8lujKqvV01VXch+evei0B4v48ExH33RVha9bdPzp EuBw== X-Gm-Message-State: AO0yUKWr00vYsveaovVEblFr0nA96OfhL7KYPIKPGnpATrcZkVrvtXGd CTe71BbJwBqFtJtrJIOtB5FewwBJc/YRl+qdKHlAExeLh5/K3gZznLU7nn36Y4Zl1EZd2k2tw6g mE/+QU9dhHOzM/bCuCw== X-Received: by 2002:a05:622a:58f:b0:3bf:d1b5:b85e with SMTP id c15-20020a05622a058f00b003bfd1b5b85emr13210531qtb.45.1679067851420; Fri, 17 Mar 2023 08:44:11 -0700 (PDT) X-Google-Smtp-Source: AK7set+49OmrPsWYdHGmUg8V3qIqFTc3e5f6cGDVQJ0HbSZAvymdY/HtDhR63P+/I3AF86tjjIK3Ng== X-Received: by 2002:a05:622a:58f:b0:3bf:d1b5:b85e with SMTP id c15-20020a05622a058f00b003bfd1b5b85emr13210496qtb.45.1679067851101; Fri, 17 Mar 2023 08:44:11 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id j13-20020ac8550d000000b003b82489d8acsm1702132qtq.21.2023.03.17.08.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 08:44:10 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 17 Mar 2023 11:44:10 -0400 (EDT) To: Patrick Palka cc: gcc-patches@gcc.gnu.org, jason@redhat.com Subject: Re: [PATCH] c++: NTTP constraint depending on outer args [PR109160] In-Reply-To: <20230317152629.3944138-1-ppalka@redhat.com> Message-ID: References: <20230317152629.3944138-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 Fri, 17 Mar 2023, Patrick Palka wrote: > Here we're crashing during satisfaction for the NTTP 'C auto' from > do_auto_deduction ultimately because convert_template_argument / unify > don't pass all outer template arguments to do_auto_deduction, and during > satisfaction we need to know all arguments. While these callers do > pass some outer arguments, they are only sufficient to properly > substitute the 'auto' and are not necessarily the complete set. > > Fortunately it seems it's possible to obtain the full set of outer > arguments from these callers via convert_template_argument's IN_DECL > parameter and unify's TPARMS parameter. So this patch adds a TMPL > parameter to do_auto_deduction, used only during adc_unify deduction, > which contains the (partially instantiated) template corresponding to > this auto and from which we can obtain all outer template arguments for > satisfaction. > > This patch also adjusts the IN_DECL argument passed to > coerce_template_parms from tsubst_decl so that we could in turn safely > assume convert_template_argument's IN_DECL is always a TEMPLATE_DECL, > and thus could pass it as-is to do_auto_deduction. (tsubst_decl seems > to be the only caller that passes a non-empty non-template IN_DECL to > coerce_template_parms.) > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk/12? > > PR c++/109160 > > gcc/cp/ChangeLog: > > * cp-tree.h (do_auto_deduction): Add defaulted TMPL parameter. > * pt.cc (convert_template_argument): Pass IN_DECL as TMPL to > do_auto_deduction. > (tsubst_decl) : Pass TMPL instead of T as > IN_DECL to coerce_template_parms. > (unify) : Pass the corresponding > template as TMPL to do_auto_deduction. > (do_auto_deduction): Document default arguments. Use TMPL > to obtain a full set of template arguments for satisfaction > in the adc_unify case. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp2a/concepts-placeholder12.C: New test. > --- > gcc/cp/cp-tree.h | 3 +- > gcc/cp/pt.cc | 30 ++++++++++++++----- > .../g++.dg/cpp2a/concepts-placeholder12.C | 29 ++++++++++++++++++ > 3 files changed, 53 insertions(+), 9 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-placeholder12.C > > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index dfc1c845768..e7190c5cc62 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -7324,7 +7324,8 @@ extern tree do_auto_deduction (tree, tree, tree, > auto_deduction_context > = adc_unspecified, > tree = NULL_TREE, > - int = LOOKUP_NORMAL); > + int = LOOKUP_NORMAL, > + tree = NULL_TREE); > extern tree type_uses_auto (tree); > extern tree type_uses_auto_or_concept (tree); > extern void append_type_to_template_for_access_check (tree, tree, tree, > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index ddbd73371b9..6400b686a58 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -8638,7 +8638,7 @@ convert_template_argument (tree parm, > else if (tree a = type_uses_auto (t)) > { > t = do_auto_deduction (t, arg, a, complain, adc_unify, args, > - LOOKUP_IMPLICIT); > + LOOKUP_IMPLICIT, in_decl); > if (t == error_mark_node) > return error_mark_node; > } > @@ -15243,7 +15243,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) > the template. */ > argvec = (coerce_template_parms > (DECL_TEMPLATE_PARMS (gen_tmpl), > - argvec, t, complain)); > + argvec, tmpl, complain)); > if (argvec == error_mark_node) > RETURN (error_mark_node); > hash = spec_hasher::hash (gen_tmpl, argvec); > @@ -24655,7 +24655,9 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, > if (tree a = type_uses_auto (tparm)) > { > tparm = do_auto_deduction (tparm, arg, a, > - complain, adc_unify, targs); > + complain, adc_unify, targs, > + LOOKUP_NORMAL, > + TPARMS_PRIMARY_TEMPLATE (tparms)); > if (tparm == error_mark_node) > return 1; > } > @@ -30643,13 +30645,20 @@ unparenthesized_id_or_class_member_access_p (tree init) > adc_requirement contexts to communicate the necessary template arguments > to satisfaction. OUTER_TARGS is ignored in other contexts. > > - For partial-concept-ids, extra args may be appended to the list of deduced > - template arguments prior to determining constraint satisfaction. */ > + Additionally for adc_unify contexts TMPL is the template for which this > + auto is a template parameter type. > + > + For partial-concept-ids, extra args from OUTER_TARGS, TMPL and the current > + scope may be appended to the list of deduced template arguments prior to > + determining constraint satisfaction as appropriate. */ > > tree > do_auto_deduction (tree type, tree init, tree auto_node, > - tsubst_flags_t complain, auto_deduction_context context, > - tree outer_targs, int flags) > + tsubst_flags_t complain /* = tf_warning_or_error */, > + auto_deduction_context context /* = adc_unspecified */, > + tree outer_targs /* = NULL_TREE */, > + int flags /* = LOOKUP_NORMAL */, > + tree tmpl /* = NULL_TREE */) > { > if (init == error_mark_node) > return error_mark_node; > @@ -30839,7 +30848,12 @@ do_auto_deduction (tree type, tree init, tree auto_node, > } > } > > - tree full_targs = add_to_template_args (outer_targs, targs); > + tree full_targs = outer_targs; > + > + if (context == adc_unify) > + full_targs = add_outermost_template_args (tmpl, full_targs); > + > + full_targs = add_to_template_args (full_targs, targs); > > /* HACK: Compensate for callers not always communicating all levels of > outer template arguments by filling in the outermost missing levels Note, this nearby was introduced by r11-7540-gb49d23f3e238c0 to compensate mostly for adc_unify callers. This patch now makes us communicate all levels of outer template arguments in most situations, but since the patch relies on TPARMS_PRIMARY_TEMPLATE I believe the hack is still necessary since TPARMS_PRIMARY_TEMPLATE isn't reliably set for e.g. partial instantiations of partial specializations. > diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder12.C b/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder12.C > new file mode 100644 > index 00000000000..3d4d138720e > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-placeholder12.C > @@ -0,0 +1,29 @@ > +// PR c++/109160 > +// { dg-do compile { target c++20 } } > + > +template > +concept C = B; > + > +template struct X { }; > + > +template > +struct A { > + template auto V> static void f(); > + template auto V> static void g(X); > + template auto V> static inline int value = V; > + template auto V> struct D { }; > +}; > + > +int main() { > + A::f<0>(); > + A::f<0>(); // { dg-error "no match|constraints" } > + > + A::g(X<0>{}); > + A::g(X<0>{}); // { dg-error "no match|constraints" } > + > + bool v1 = A::value<0>; > + bool v2 = A::value<0>; // { dg-error "constraints" } > + > + A::D<0> d1; > + A::D<0> d2; // { dg-error "constraints" } > +} > -- > 2.40.0 > >