From patchwork Wed Mar 15 12:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 66408 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B7E083857438 for ; Wed, 15 Mar 2023 12:45:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B7E083857438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678884302; bh=+Og/O/OTezMrMhJvylgWCEV40LW9/5+w0g2g8UKBGW4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=HXY2ya+ZwS0ZkpO84mYfsRCziqO98hYcA9C2aUdQRUufFSVQMARmFgMWRU9xEfIe8 mNivOem2J3Ds6KGS6bKEVIpSFdQiPIkG+jbFaX6RZOc/u9AldYCy45qH6oz2UvY78q ADPaZIk7g1yVyCi8SLSCnOs5KdW4dYZRdgCQa/RM= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 7D6513858C78 for ; Wed, 15 Mar 2023 12:44:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D6513858C78 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-TB_W1Yh8MK2XZzOGVZfYdg-1; Wed, 15 Mar 2023 08:44:31 -0400 X-MC-Unique: TB_W1Yh8MK2XZzOGVZfYdg-1 Received: by mail-qk1-f199.google.com with SMTP id a14-20020a05620a16ce00b0074616159bd9so194787qkn.2 for ; Wed, 15 Mar 2023 05:44:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678884270; 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=+Og/O/OTezMrMhJvylgWCEV40LW9/5+w0g2g8UKBGW4=; b=FPnV7lgQ5XlyKqfgj9Aa1bCzXiXK+/YpFCNrtmpl0YQN93d7wjWikNSu+U7Rqx3iZA m4Nb7Z3gM/+OIoFavvk6cKDCI/odSVGpTHRRYCDGXxR6TkX1ouH2MIKXbx4YxWlDMixN RNs1ow48yN4u7dic4kUlNxS2dcXbXE6C1IiC1BWkfJFKB+e/W8FMfg2EGVi5VW9Gx9za kK3+N6ZDYCuo+n4Px5kc1LmNSExP3nxvci8CP7VPosPbsVt5Y/PlMP+6XELzk0SfwF3A 5R/CzN8Wt/3Q1Lp8e+tOjXAyxiNMJqUMjKmKdjhTaXiV0dlSSjBosS29mgBA4MkxqZn5 bkmQ== X-Gm-Message-State: AO0yUKVhgtOhBecxeeok7l7X5jM0LK4DfUA4aJ8qzHoAI/kMyq/35Uua rxnv4iJnFbfdXcrjnUYZz7tlP1WUnC53OT6VJWetxIoJ4TLaxoHfDjU/Y7o7JEwajorSQAZgOv4 7eK80TIx15XsMOQQFGN58Wz/OcVa6qvNbHqKAAu2MRpxbCNHnaa71/3y9nrKibQB3lMZoGkBZUw == X-Received: by 2002:ac8:7d95:0:b0:3bf:b0c6:4993 with SMTP id c21-20020ac87d95000000b003bfb0c64993mr73907731qtd.44.1678884270638; Wed, 15 Mar 2023 05:44:30 -0700 (PDT) X-Google-Smtp-Source: AK7set/f5FgwrC6W6SfauyDjHpcBsA8CHpyD+vXOlOte8bi6FZu9hHM7+2vNY32tuwNveIiqfcaCrw== X-Received: by 2002:ac8:7d95:0:b0:3bf:b0c6:4993 with SMTP id c21-20020ac87d95000000b003bfb0c64993mr73907684qtd.44.1678884270227; Wed, 15 Mar 2023 05:44:30 -0700 (PDT) Received: from jason.cygnus.com (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 133-20020a370c8b000000b00745793b5fa5sm3749368qkm.45.2023.03.15.05.44.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 05:44:29 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed 1/2] c++: coerce_template_template_parms interface tweak Date: Wed, 15 Mar 2023 08:44:26 -0400 Message-Id: <20230315124427.687003-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.6 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 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- This should have no semantic effect, but is a prerequisite for the PR108179 fix to follow. PR c++/108179 gcc/cp/ChangeLog: * pt.cc (coerce_template_template_parms): Take the arg and parm templates directly. (coerce_template_template_parm): Adjust. (template_template_parm_bindings_ok_p): Adjust. (convert_template_argument): Adjust. --- gcc/cp/pt.cc | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) base-commit: 9e44a9932c11f028269f3aa7e3031e703d151b0b diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index c53d8e279c6..c9cd9f6097d 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -7772,11 +7772,8 @@ coerce_template_template_parm (tree parm, template