From patchwork Wed May 3 04:30:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1776120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=p9c5rMM9; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QB3ss4RNrz20fg for ; Wed, 3 May 2023 14:30:56 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B06A83858D20 for ; Wed, 3 May 2023 04:30:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B06A83858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1683088251; bh=KczPAlviS7xWxGZbTh2l0soCmohX7oJ7BPcfBEpuh/Y=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=p9c5rMM97XwoRl+moOlm9vHMY0OBSd/ZSS1V8NWdc7W3WTZZH/24vG634IqT1GGqO wsq5vk8GW3Ak2/nFvh+yMfWqHnJvWpPXw4n/+KkbA9TFpqmEwcXWIhKJr0QdBxN75p k+GpP1C3fdHWFlHD32DpWyudnh+OwVScJfwT3Z0w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 8A3E93858D20 for ; Wed, 3 May 2023 04:30:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A3E93858D20 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-475-LBOdwXNyOf-s_pIi7m132Q-1; Wed, 03 May 2023 00:30:29 -0400 X-MC-Unique: LBOdwXNyOf-s_pIi7m132Q-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-3ef33ed8843so25437781cf.1 for ; Tue, 02 May 2023 21:30:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683088229; x=1685680229; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KczPAlviS7xWxGZbTh2l0soCmohX7oJ7BPcfBEpuh/Y=; b=SvocZ7Hc5biOTWZOkyBx9JXroPSSw8b5MB/m2O8btjnZb4zVio1y2V6bHnab/b8oJs 6NW14NZlCnL3ns4HryYnXdHCW8nOOTFFGYlceEH6lhKiJVZpwwgFeDLYoUAhx2uXMTQi xKmNTfHAQhF77XBpPdwEKntrUne7/P6jX53SW+Inp1P5JptBcJNiixqF2SbTsB/c/s++ 2dZ84aM927crIg1Bt2g5qWkSb7WGWYLDIfAvjDsUm34lOeLaevcUgGPptvFn6bukjAQN x06IzlbvLldDSycuNn02TugqAPY5m62PrYlZmShMWkMk0s2+l8FSuvk2sF1BnSzI83qe KRkg== X-Gm-Message-State: AC+VfDyHgfi3feQOmICbn/v35YBR7AqN/2ZRzqJw0y+iw/3ozmv4sdLq 6wJnVJtVbfj20qOFu3Dp8up0e+IPEFuckpWSwFS+blgIqDbwIa5yV6CISDVXu5NWJQ99X7sKSF3 OCW8IoARK8XVV7fT3IxykEZfKfXwN6dnnLZGycPGYlSIzCEdnwTh/609DsoegLxsmeASGJK0O4g == X-Received: by 2002:ac8:5a03:0:b0:3f0:a3b6:7c32 with SMTP id n3-20020ac85a03000000b003f0a3b67c32mr28303389qta.46.1683088228999; Tue, 02 May 2023 21:30:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44N8sdYpx6dxcSfjuhi9PH4mmAbTAuInqlUNakJ4QDPo7ZbkPY/uPd4G9jLQsgCqJZOWKGTQ== X-Received: by 2002:ac8:5a03:0:b0:3f0:a3b6:7c32 with SMTP id n3-20020ac85a03000000b003f0a3b67c32mr28303371qta.46.1683088228557; Tue, 02 May 2023 21:30:28 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id e21-20020ac84b55000000b003ef2c959d1bsm10920332qts.67.2023.05.02.21.30.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 21:30:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: fix TTP level reduction cache Date: Wed, 3 May 2023 00:30:23 -0400 Message-Id: <20230503043023.2076907-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- We try to cache the result of reduce_template_parm_level so that when we reduce the same parm multiple times we get the same result, but this wasn't working for template template parms because in that case TYPE is a TEMPLATE_TEMPLATE_PARM, and so same_type_p was false because of the same level mismatch that we're trying to adjust for. So in that case compare the template parms of the template template parms instead. The result can be seen in nontype12.C, where we previously gave three duplicate errors on line 7 and now give only one because subsequent substitutions use the cache. gcc/cp/ChangeLog: * pt.cc (reduce_template_parm_level): Fix comparison of template template parm to cached version. gcc/testsuite/ChangeLog: * g++.dg/template/nontype12.C: Check for duplicate error. --- gcc/cp/pt.cc | 7 ++++++- gcc/testsuite/g++.dg/template/nontype12.C | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) base-commit: d7cb9720ed54687bd1135c5e6ef90776a9db0bd5 diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 471fc20bc5b..5446b5058b7 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -4550,7 +4550,12 @@ reduce_template_parm_level (tree index, tree type, int levels, tree args, if (TEMPLATE_PARM_DESCENDANTS (index) == NULL_TREE || (TEMPLATE_PARM_LEVEL (TEMPLATE_PARM_DESCENDANTS (index)) != TEMPLATE_PARM_LEVEL (index) - levels) - || !same_type_p (type, TREE_TYPE (TEMPLATE_PARM_DESCENDANTS (index)))) + || !(TREE_CODE (type) == TEMPLATE_TEMPLATE_PARM + ? (comp_template_parms + (DECL_TEMPLATE_PARMS (TYPE_NAME (type)), + DECL_TEMPLATE_PARMS (TEMPLATE_PARM_DECL + (TEMPLATE_PARM_DESCENDANTS (index))))) + : same_type_p (type, TREE_TYPE (TEMPLATE_PARM_DESCENDANTS (index))))) { tree orig_decl = TEMPLATE_PARM_DECL (index); diff --git a/gcc/testsuite/g++.dg/template/nontype12.C b/gcc/testsuite/g++.dg/template/nontype12.C index e37cf8f7646..6642ffd0a13 100644 --- a/gcc/testsuite/g++.dg/template/nontype12.C +++ b/gcc/testsuite/g++.dg/template/nontype12.C @@ -4,7 +4,8 @@ template struct A { template int foo(); // { dg-error "double" "" { target c++17_down } } - template class> int bar(); // { dg-error "double" "" { target c++17_down } } + template class> int bar(); // { dg-bogus {double.*C:7:[^\n]*double} } + // { dg-error "double" "" { target c++17_down } .-1 } template struct X; // { dg-error "double" "" { target c++17_down } } };