From patchwork Wed May 3 19:25:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1776632 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=2620:52:3:1:0:246e:9693:128c; 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=TgMMNEX+; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4QBRkB5Ppgz20fg for ; Thu, 4 May 2023 05:25:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 123713856DCA for ; Wed, 3 May 2023 19:25:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 123713856DCA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1683141935; bh=+M/Tyuj8Uzy+Q2BkG3S32IZ/XZ8u9MUskYo29YFFnA8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=TgMMNEX+4vjjMQNSzEKhBfYoNVcEKy5re6ZftYDIQwMSsX0LIYUjSfMTEfNu++zAu axPRgPbheiBfrb5HmrkUhKJkzuNccwPM+I2WUB1Rkibj6k+uY1q60/I/5uspunf3t4 BZ9V3x1Yu2wJEpmOoM4veznWaxgAE0QeA3f1ZFLE= 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 2D2F4385842D for ; Wed, 3 May 2023 19:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2D2F4385842D Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-MlPa_2hkNsSR5dhFHU5nYQ-1; Wed, 03 May 2023 15:25:09 -0400 X-MC-Unique: MlPa_2hkNsSR5dhFHU5nYQ-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-61a6bb9f808so25736226d6.3 for ; Wed, 03 May 2023 12:25:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683141909; x=1685733909; 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=+M/Tyuj8Uzy+Q2BkG3S32IZ/XZ8u9MUskYo29YFFnA8=; b=hkMg5mLP6z4I903apO/tLI93DFAgAYovsE76bcWmDuV1bABKmhxTbnc13OGbh0LhqV TAxFLd5QUrwYWPHfAndrDeElp6olNzue5dcPVvVTRKZzG9BUFm36gr+4YmIT/oXtMOVg YRZXUiUejhlFsT8N8YAJrV1EGn320jjGw/eLPBOEinX0k2D6EWhso00IRS9rOED5bvA7 FKfnALjh+pakkEf2Pz7ea2URNvabliOohiEU5OA45LztZUR/C6ti2NFXNAOK/qaRlONA e7gY6sBj+R1X0vpE79FM8efziRid7WcOTgWs1TmvcpVMyRPo21FOwtdm4QLQkXEgPRfP p9fA== X-Gm-Message-State: AC+VfDzvxXbGISh2wLyYassLqk8+rkMf1h6T3+cuWJRztqVBQvFqKwBf tLyuZBCpyHbGH+hKSaEdB9FdlNgjVht3rXq8aXrGrtDCxpVYwr9yKkPwjjYuiqoQEfMoqjrHlKT lIiO9hPzUponwtB0GVd1YMJzdJMwJZndNG0Q+Delg75ZI+eNk0qTVuVNeQRzriXfIZ3Y46wXe3A == X-Received: by 2002:a05:6214:1307:b0:5ef:4ecb:cf9d with SMTP id pn7-20020a056214130700b005ef4ecbcf9dmr13451256qvb.6.1683141908883; Wed, 03 May 2023 12:25:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wKdvAFJ+r+E5bEflCx8F6TIlTm/6vRKF0Sg/KxAamLXG/n5DsqJBiUKltnKQ/2OwfwLAZZg== X-Received: by 2002:a05:6214:1307:b0:5ef:4ecb:cf9d with SMTP id pn7-20020a056214130700b005ef4ecbcf9dmr13451211qvb.6.1683141908407; Wed, 03 May 2023 12:25:08 -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 a12-20020a0ce34c000000b005ef608dc422sm10816462qvm.41.2023.05.03.12.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 12:25:07 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: over-eager friend matching [PR109649] Date: Wed, 3 May 2023 15:25:04 -0400 Message-Id: <20230503192504.2299704-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< -- A bug in the simplification I did around 91618; at this point X::f has DECL_IMPLICIT_INSTANTIATION set, but we've already identified what template it corresponds to, so we don't want to call check_explicit_specialization. To distinguish this case we need to look at DECL_TI_TEMPLATE. grokfndecl has for a long time set it to the OVERLOAD in this case, while the new cases I added for 91618 were leaving DECL_TEMPLATE_INFO null; let's adjust them to match. PR c++/91618 PR c++/109649 gcc/cp/ChangeLog: * friend.cc (do_friend): Don't call check_explicit_specialization if DECL_TEMPLATE_INFO is already set. * decl2.cc (check_classfn): Set DECL_TEMPLATE_INFO. * name-lookup.cc (set_decl_namespace): Likewise. gcc/testsuite/ChangeLog: * g++.dg/template/friend77.C: New test. --- gcc/cp/decl2.cc | 1 + gcc/cp/friend.cc | 3 ++- gcc/cp/name-lookup.cc | 1 + gcc/testsuite/g++.dg/template/friend77.C | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/friend77.C base-commit: 3b7eecca20bcb05e0220b3d012df012902a23534 diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index 9594be4092c..b510cdac554 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -855,6 +855,7 @@ check_classfn (tree ctype, tree function, tree template_parms) So tell check_explicit_specialization to look for a match. */ SET_DECL_IMPLICIT_INSTANTIATION (function); + DECL_TEMPLATE_INFO (function) = build_template_info (fns, NULL_TREE); matched = function; } diff --git a/gcc/cp/friend.cc b/gcc/cp/friend.cc index b36de2b20bb..5ab5c1fec73 100644 --- a/gcc/cp/friend.cc +++ b/gcc/cp/friend.cc @@ -661,7 +661,8 @@ do_friend (tree scope, tree declarator, tree decl, if (decl == error_mark_node) return error_mark_node; - if (!class_template_depth && DECL_IMPLICIT_INSTANTIATION (decl)) + if (!class_template_depth && DECL_IMPLICIT_INSTANTIATION (decl) + && TREE_CODE (DECL_TI_TEMPLATE (decl)) != TEMPLATE_DECL) /* "[if no non-template match is found,] each remaining function template is replaced with the specialization chosen by deduction from the friend declaration or discarded if deduction fails." diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 8fd5733c1e2..ad03141df43 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -5938,6 +5938,7 @@ set_decl_namespace (tree decl, tree scope, bool friendp) So tell check_explicit_specialization to look for a match. */ SET_DECL_IMPLICIT_INSTANTIATION (decl); + DECL_TEMPLATE_INFO (decl) = build_template_info (old, NULL_TREE); return; } diff --git a/gcc/testsuite/g++.dg/template/friend77.C b/gcc/testsuite/g++.dg/template/friend77.C new file mode 100644 index 00000000000..f232cb10756 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend77.C @@ -0,0 +1,19 @@ +// PR c++/109649 + +template +class X +{ + void f(){} +}; + +class Y +{ + friend void X::f(); // { dg-error "private" } +}; + +int main() +{ + X t; + t.f(); // { dg-error "private" } + Y b; +}