From patchwork Tue Mar 7 19:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1753590 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=VVq1osKk; 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 4PWQcZ3QnVz246k for ; Wed, 8 Mar 2023 06:34:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 064EC38515CC for ; Tue, 7 Mar 2023 19:34:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 064EC38515CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678217659; bh=GxJCa2IovRPvmT98GaJLuk899tlDO1/zOt4DXtI4T0w=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=VVq1osKksUisWY8buXmb2zQJB4oea3nt78L8p7oqyXlpNaswxBN92N3ux7fYAqOC5 NopWQXZ21aC3rT5aE/245AXHVW/7IlI5b/+roaUFmchOACbBL7Y92YEfXz3PjFjE9x rCI9kPeD+gM5mxYr9TQak9u/PLh84wSZn4n9kcDg= 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 3A31B3858C2C for ; Tue, 7 Mar 2023 19:33:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3A31B3858C2C Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-rjG3wQ69NcuOwPj-yF73rw-1; Tue, 07 Mar 2023 14:33:56 -0500 X-MC-Unique: rjG3wQ69NcuOwPj-yF73rw-1 Received: by mail-qv1-f70.google.com with SMTP id d27-20020a0caa1b000000b00572765a687cso8053783qvb.19 for ; Tue, 07 Mar 2023 11:33:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678217635; 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=GxJCa2IovRPvmT98GaJLuk899tlDO1/zOt4DXtI4T0w=; b=i1zpBPq7jJph+JFOzpL/K/KgOfkbcpAPjKVNpOcmCmHUuGfd8osYDAQvD2xqWfTEJU laEMAZjwlW1Xd6yN7GfA3iRVOiq+q7RcCm7CvQykGTdbxo1bC9+R6Lbe+DBLOCdxUXZW w9Obv/VMyktr4K3wjX2sKyt2/u38SPSgIRf8XhTmOc2PtzwICfi4t6qEkI5azqmwReHG CYr2+v8XK/Ro+XWEO7XKa6SH1RHRmfq7aSC6sDs6GV7gbtpxmOFXfI3oDHO0HGErGMdD Mld2ekU3NDga52hLMiOUT1RITvXVs+3CVmjC64gxqlrwMMJ3lnIh1kin5f9/ULAoWyhx e/mA== X-Gm-Message-State: AO0yUKUdp8hAdktrkMZ2+35E2eeIo4fJV6EEcssNd3pHPPxuI9Ccd1ON eiHWHwaZoyNgklRmhqw/4zraAKvYQgW0LqSqwYojE52A0b3noDpnfMLvHq+A+wp9B2ps0jgbaNv 77DgjEyIHQaHQVr8W9/9xgwMdYZ7lrJWzfRXHWImKRCA/D0ADe+djQwqg2UjiibR2GA7Xq9LWdw == X-Received: by 2002:a05:622a:188b:b0:3c0:6c3:fe72 with SMTP id v11-20020a05622a188b00b003c006c3fe72mr34036171qtc.10.1678217635221; Tue, 07 Mar 2023 11:33:55 -0800 (PST) X-Google-Smtp-Source: AK7set9/O/rWpUshTVUI10Oj2MufkD2yemDMvKkJuENJUUztJcnLq/iV514Be7uiJWcCCtUaU2eZ9Q== X-Received: by 2002:a05:622a:188b:b0:3c0:6c3:fe72 with SMTP id v11-20020a05622a188b00b003c006c3fe72mr34036080qtc.10.1678217634191; Tue, 07 Mar 2023 11:33:54 -0800 (PST) Received: from jason.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 n67-20020a37bd46000000b0073ba2c4ee2esm9988903qkf.96.2023.03.07.11.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 11:33:53 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek Subject: [PATCH] c++: static lambda tsubst [PR108526] Date: Tue, 7 Mar 2023 14:33:49 -0500 Message-Id: <20230307193349.578669-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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- A missed piece of the patch for static operator(): in tsubst_function_decl, we don't want to replace the first parameter with a new closure pointer if operator() is static. PR c++/108526 PR c++/106651 gcc/cp/ChangeLog: * pt.cc (tsubst_function_decl): Don't replace the closure parameter if DECL_STATIC_FUNCTION_P. gcc/testsuite/ChangeLog: * g++.dg/cpp23/static-operator-call5.C: Pass -g. --- gcc/cp/pt.cc | 4 ++-- gcc/testsuite/g++.dg/cpp23/static-operator-call5.C | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) base-commit: 247cacc9e381d666a492dfa4ed61b7b19e2d008f diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 85136df1730..aafc99d12c3 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -14393,12 +14393,12 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain, DECL_NAME (r) = make_conv_op_name (TREE_TYPE (type)); tree parms = DECL_ARGUMENTS (t); - if (closure) + if (closure && !DECL_STATIC_FUNCTION_P (t)) parms = DECL_CHAIN (parms); parms = tsubst (parms, args, complain, t); for (tree parm = parms; parm; parm = DECL_CHAIN (parm)) DECL_CONTEXT (parm) = r; - if (closure) + if (closure && !DECL_STATIC_FUNCTION_P (t)) { tree tparm = build_this_parm (r, closure, type_memfn_quals (type)); DECL_NAME (tparm) = closure_identifier; diff --git a/gcc/testsuite/g++.dg/cpp23/static-operator-call5.C b/gcc/testsuite/g++.dg/cpp23/static-operator-call5.C index ae022d0b971..f7ce8c03008 100644 --- a/gcc/testsuite/g++.dg/cpp23/static-operator-call5.C +++ b/gcc/testsuite/g++.dg/cpp23/static-operator-call5.C @@ -1,5 +1,6 @@ // PR c++/108526 // { dg-do compile { target c++23 } } +// { dg-additional-options -g } PR108706 template void f() {