aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2023-01-25 15:13:30 +0100
committerJakub Jelinek <jakub@redhat.com>2023-01-25 15:13:30 +0100
commit9d4c00cdaccc3decd07740e817387ce844ef3ac9 (patch)
tree35423fbb143d5a536507e0f5fa77d100f637e4da /gcc/cp
parent267f01a493ab8a0bec9325ce3386b946c46f2e98 (diff)
downloadgcc-9d4c00cdaccc3decd07740e817387ce844ef3ac9.zip
gcc-9d4c00cdaccc3decd07740e817387ce844ef3ac9.tar.gz
gcc-9d4c00cdaccc3decd07740e817387ce844ef3ac9.tar.bz2
c++: Fix up mangling of static lambdas [PR108525]
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. 2023-01-25 Jakub Jelinek <jakub@redhat.com> 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.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/mangle.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc
index 62e9f9f..f2cda3b 100644
--- a/gcc/cp/mangle.cc
+++ b/gcc/cp/mangle.cc
@@ -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))