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 B69833858421 for ; Tue, 20 Dec 2022 15:30:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B69833858421 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=1671550240; 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; bh=qAiP4+jZkofHBAeOEJDZujS1SIzMUkdq7m+Er3R87JE=; b=FNwfZslTgR3jbYUW3Yqfhye+CLoQ7DITrA8uVmSGiC6ikJUUnCzCAeIAkiHan2d7Ye7Hxz Ex7NRE7f1LIwaFwocTDczILAzQnw6Em+eRk49T6/9IHXp3oz3L4pRcXgogYZkNdA1CvbMC aOS5/ba55KSJ/HooP9RWvDFhtu88hnE= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-486-ehpvceQtO8mOtcSxGBcVpA-1; Tue, 20 Dec 2022 10:30:39 -0500 X-MC-Unique: ehpvceQtO8mOtcSxGBcVpA-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-352e29ff8c2so147401497b3.21 for ; Tue, 20 Dec 2022 07:30:38 -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:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qAiP4+jZkofHBAeOEJDZujS1SIzMUkdq7m+Er3R87JE=; b=o2A3ILfnIbvC6qQsIiqQlWOZ5lgTrxcJKLMrtzP5uVcWaq0QHAZkpSJeGjbpdRSPPW xoLb5V9gsKVNMbu/Ro7pmPXVGTVJ/WI+KFfmCQh6SZRFy4a85ju0S5BrwwK86vPnxLi5 9Ptn+PwIy64G8QntvtjF86M4khgt6jcg73jzkfmMqIn/XzN+nHliAGDaJXj2OwrU1wDp FWmGww5ZIrxlPMk8hRbb5TCCxPpMm5xSojapGR3xP1eWQIHUzqlzqbujtlq3wSuPlvx8 e8llXGZ7xPdyYiHvV+FoU8/75cEzNK4301i6JdpXt51XxLvWz3CkDTtBnJ2Z2zZlr4pw wn6A== X-Gm-Message-State: ANoB5pmAUT6VeIFnS47CKOLyD/7mOuUm31O6iXbin96jL410ue2DUzzE iArzNVEBs0wtg+loHmIblTZYgj06Zj6DfkaPgiHLYMWSJuzEf9yQ7EUvuoVdSnA6Lw+11KPffmx 4dPybuEU6ek0MwM/13hTPCBRvJGqJXvzxCx85oJglbKWPvcZfeEke+XY5H+1mZkFw22A= X-Received: by 2002:a25:e651:0:b0:70c:419a:faf0 with SMTP id d78-20020a25e651000000b0070c419afaf0mr42791682ybh.49.1671550237447; Tue, 20 Dec 2022 07:30:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf7+5SL+CRTL0HXGIe/42/jOStM72HlRRclq5Vcw5mp3bHXZiDQlTp0kzWAOh7R63eIBrJHkMA== X-Received: by 2002:a25:e651:0:b0:70c:419a:faf0 with SMTP id d78-20020a25e651000000b0070c419afaf0mr42791654ybh.49.1671550237057; Tue, 20 Dec 2022 07:30:37 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id u8-20020a05620a454800b006f474e6a715sm8929150qkp.131.2022.12.20.07.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 07:30:36 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++, tree: walk TREE_VEC (and VECTOR_CST) in natural order [PR101886] Date: Tue, 20 Dec 2022 10:30:34 -0500 Message-Id: <20221220153034.2746407-1-ppalka@redhat.com> X-Mailer: git-send-email 2.39.0.95.g7c2ef319c5 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,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: Unfortunately the extract_autos_r fix in r13-4799-ga7c8036b26082d is derailed by the fact that walk_tree_1 currently walks the elements of a TREE_VEC in reverse, which means for A in the below testcase extract_autos_r ends up adjusting the TEMPLATE_TYPE_IDX of the first auto rather than the second one, and the first auto is the canonical auto of level 2 and index 0, so we rightfully trigger the sanity check added in that commit. It seems TREE_VEC and VECTOR_CST are the only trees that we walk in reverse, and this has been the case since r21884 whence the original version of walk_tree_1 was introduced. But that's arguably unnatural and inconsistent with how we walk other compound trees such as CONSTRUCTORs and EXPR_P trees. So this patch makes walk_tree_1 walk these trees in forward order, which fixes the below testcase. This in turn revealed that keep_template_parm builds up the list of found template parameters in reverse, which previously compensated for the TREE_VEC behavior, but now we should be building the list in the natural order as well for sake of pretty printing parameter mappings. Bootstrapped and regtested on x86_64-pc-linux-gnu with --enable-languages=all,ada,go does this look OK for trunk? PR c++/101886 gcc/cp/ChangeLog: * pt.cc (find_template_parameter_info::parm_list_tail): New data member. (keep_template_parm): Use parm_list_tail to append rather than prepend to parm_list. gcc/ChangeLog: * tree.cc (walk_tree_1) : Walk the elements in the natural order. : Likewise. gcc/testsuite/ChangeLog: * g++.dg/concepts/diagnostic12.C: Adjust expected order of template parameters within parameter mapping. * g++.dg/concepts/auto6.C: New test. --- gcc/cp/pt.cc | 13 +++++++++---- gcc/testsuite/g++.dg/concepts/auto6.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/concepts/diagnostic12.C | 2 +- gcc/tree.cc | 20 ++++++++++---------- 4 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 gcc/testsuite/g++.dg/concepts/auto6.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 2b7b3756b68..df125a63785 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -10640,14 +10640,14 @@ for_each_template_parm (tree t, tree_fn_t fn, void* data, struct find_template_parameter_info { explicit find_template_parameter_info (tree ctx_parms) - : parm_list (NULL_TREE), - ctx_parms (ctx_parms), + : ctx_parms (ctx_parms), max_depth (TMPL_PARMS_DEPTH (ctx_parms)) {} hash_set visited; hash_set parms; - tree parm_list; + tree parm_list = NULL_TREE; + tree *parm_list_tail = &parm_list; tree ctx_parms; int max_depth; }; @@ -10693,7 +10693,12 @@ keep_template_parm (tree t, void* data) if (TYPE_P (t)) t = TYPE_MAIN_VARIANT (t); if (!ftpi->parms.add (t)) - ftpi->parm_list = tree_cons (NULL_TREE, t, ftpi->parm_list); + { + /* Append T to PARM_LIST. */ + tree node = build_tree_list (NULL_TREE, t); + *ftpi->parm_list_tail = node; + ftpi->parm_list_tail = &TREE_CHAIN (node); + } /* Verify the parameter we found has a valid index. */ if (flag_checking) diff --git a/gcc/testsuite/g++.dg/concepts/auto6.C b/gcc/testsuite/g++.dg/concepts/auto6.C new file mode 100644 index 00000000000..1f6d72e54cc --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/auto6.C @@ -0,0 +1,14 @@ +// PR c++/101886 +// { dg-do compile { target c++17_only } } +// { dg-options "-fconcepts-ts" } + +template struct A { }; + +template +void f() { + A a; + A b1 = a; + A b2 = a; +} + +template void f(); diff --git a/gcc/testsuite/g++.dg/concepts/diagnostic12.C b/gcc/testsuite/g++.dg/concepts/diagnostic12.C index 548ba9c1b3d..8086500760b 100644 --- a/gcc/testsuite/g++.dg/concepts/diagnostic12.C +++ b/gcc/testsuite/g++.dg/concepts/diagnostic12.C @@ -3,7 +3,7 @@ template concept c1 = requires (T t, Args... args) { *t; }; -// { dg-message "in requirements with .T t., .Args ... args. .with Args = \{\}; T = int" "" { target *-*-* } .-1 } +// { dg-message "in requirements with .T t., .Args ... args. .with T = int; Args = \{\}" "" { target *-*-* } .-1 } static_assert(c1); // { dg-error "failed" } diff --git a/gcc/tree.cc b/gcc/tree.cc index 0a51f9ddb4d..92199bb6503 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -11310,12 +11310,12 @@ walk_tree_1 (tree *tp, walk_tree_fn func, void *data, if (len == 0) break; - /* Walk all elements but the first. */ - while (--len) - WALK_SUBTREE (TREE_VEC_ELT (*tp, len)); + /* Walk all elements but the last. */ + for (int i = 0; i < len - 1; ++i) + WALK_SUBTREE (TREE_VEC_ELT (*tp, i)); - /* Now walk the first one as a tail call. */ - WALK_SUBTREE_TAIL (TREE_VEC_ELT (*tp, 0)); + /* Now walk the last one as a tail call. */ + WALK_SUBTREE_TAIL (TREE_VEC_ELT (*tp, len - 1)); } case VECTOR_CST: @@ -11323,11 +11323,11 @@ walk_tree_1 (tree *tp, walk_tree_fn func, void *data, unsigned len = vector_cst_encoded_nelts (*tp); if (len == 0) break; - /* Walk all elements but the first. */ - while (--len) - WALK_SUBTREE (VECTOR_CST_ENCODED_ELT (*tp, len)); - /* Now walk the first one as a tail call. */ - WALK_SUBTREE_TAIL (VECTOR_CST_ENCODED_ELT (*tp, 0)); + /* Walk all elements but the last. */ + for (unsigned i = 0; i < len - 1; ++i) + WALK_SUBTREE (VECTOR_CST_ENCODED_ELT (*tp, i)); + /* Now walk the last one as a tail call. */ + WALK_SUBTREE_TAIL (VECTOR_CST_ENCODED_ELT (*tp, len - 1)); } case COMPLEX_CST: -- 2.39.0.95.g7c2ef319c5