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.129.124]) by sourceware.org (Postfix) with ESMTPS id 7ADD03858D28 for ; Tue, 24 Jan 2023 23:19:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7ADD03858D28 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=1674602398; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=b7uWdYb0UsY2BZce/Hxivw0cudpnIt2aQpqCgPkZuHk=; b=NiWGQ7wy1fK30Md+nmIP8MCHtukCXUxNpzkgdEogb97Q1gXVUvPIe7lnhnEzw4AjxdXt32 RpDJfao8gwrAAry2nkMqmLuJi0zTBTyjEFP9AO4M7EwcLu5jh6xTsTGYBmS2xIJKMJCP6k w/U/q2NCLDerL+x273XwiQa9UKFHy+4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-675-hwZTGKf3M9-mR5i-v81b3A-1; Tue, 24 Jan 2023 18:19:57 -0500 X-MC-Unique: hwZTGKf3M9-mR5i-v81b3A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B2FB53C02184 for ; Tue, 24 Jan 2023 23:19:56 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D5631121330; Tue, 24 Jan 2023 23:19:56 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 30ONJsH22646064 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 25 Jan 2023 00:19:54 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 30ONJrFq2646061; Wed, 25 Jan 2023 00:19:53 +0100 Date: Wed, 25 Jan 2023 00:19:53 +0100 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: Fix up mangling of static lambdas [PR108525] Message-ID: Reply-To: Jakub Jelinek MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: Hi! Before the P1169R4 changes, operator () of a lambda was always a method, so it was fine to pass method_p = 1 unconditionally, but it isn't always the case, so this patch adds a check for whether it is a method or nor. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2023-01-25 Jakub Jelinek PR c++/108525 * mangle.cc (write_closure_type_name): Don't assume all lambda operator() fns are methods. * g++.dg/cpp23/static-operator-call5.C: New test. --- gcc/cp/mangle.cc.jj 2023-01-16 11:52:16.000000000 +0100 +++ gcc/cp/mangle.cc 2023-01-24 18:59:09.335156301 +0100 @@ -1816,7 +1816,7 @@ write_closure_type_name (const tree type if (abi_warn_or_compat_version_crosses (18)) G.need_abi_warning = true; - write_method_parms (parms, /*method_p=*/1, fn); + write_method_parms (parms, TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE, fn); write_char ('E'); if ((LAMBDA_EXPR_SCOPE_SIG_DISCRIMINATOR (lambda) != LAMBDA_EXPR_SCOPE_ONLY_DISCRIMINATOR (lambda)) --- gcc/testsuite/g++.dg/cpp23/static-operator-call5.C.jj 2023-01-24 19:03:21.770469929 +0100 +++ gcc/testsuite/g++.dg/cpp23/static-operator-call5.C 2023-01-24 19:02:45.224003615 +0100 @@ -0,0 +1,5 @@ +// PR c++/108525 +// { dg-do compile { target c++23 } } + +auto b = [](...) static { return 1; }; +auto foo () { return b (); } Jakub