diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-08 10:19:23 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-08 10:19:23 +0200 |
| commit | d9e7934d25da4a78ffef1f738206aa1d897911df (patch) | |
| tree | 1bd1697c14259e095f4b4790946eae7df0c5a2e3 /libiberty | |
| parent | da0970e441345f8349522ff1abac5c223044ebb1 (diff) | |
| parent | 6ffbf87ca66f4ed9cd79cff675fabe2109e46e85 (diff) | |
| download | gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.zip gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.tar.gz gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 30 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 7 |
3 files changed, 30 insertions, 13 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index c22f9d9..2c0d46b 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2022-10-07 Nathan Sidwell <nathan@acm.org> + + * cp-demangle.c (d_print_comp_inner): Allow parameter packs + in a lambda signature. + * testsuite/demangle-expected: Add tests. + 2022-09-27 Jakub Jelinek <jakub@redhat.com> PR c++/106652 diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 7ff225e..303bfbf 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -348,7 +348,7 @@ struct d_print_info be bigger than MAX_RECURSION_COUNT. */ int recursion; /* Non-zero if we're printing a lambda argument. A template - parameter reference actually means 'auto'. */ + parameter reference actually means 'auto', a pack expansion means T... */ int is_lambda_arg; /* The current index into any template argument packs we are using for printing, or -1 to print the whole pack. */ @@ -5930,9 +5930,10 @@ d_print_comp_inner (struct d_print_info *dpi, int options, case DEMANGLE_COMPONENT_PACK_EXPANSION: { - int len; - int i; - struct demangle_component *a = d_find_pack (dpi, d_left (dc)); + struct demangle_component *a = NULL; + + if (!dpi->is_lambda_arg) + a = d_find_pack (dpi, d_left (dc)); if (a == NULL) { /* d_find_pack won't find anything if the only packs involved @@ -5940,17 +5941,20 @@ d_print_comp_inner (struct d_print_info *dpi, int options, case, just print the pattern and "...". */ d_print_subexpr (dpi, options, d_left (dc)); d_append_string (dpi, "..."); - return; } - - len = d_pack_length (a); - dc = d_left (dc); - for (i = 0; i < len; ++i) + else { - dpi->pack_index = i; - d_print_comp (dpi, options, dc); - if (i < len-1) - d_append_string (dpi, ", "); + int len = d_pack_length (a); + int i; + + dc = d_left (dc); + for (i = 0; i < len; ++i) + { + if (i) + d_append_string (dpi, ", "); + dpi->pack_index = i; + d_print_comp (dpi, options, dc); + } } } return; diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 8fad689..90dd4a1 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -1574,3 +1574,10 @@ initializer for module Foo.Bar _ZGIW3FooWP3BarW3Baz initializer for module Foo:Bar.Baz + +_ZZ2L1vENKUlDpT_E_clIJiPiEEEvS0_ +void L1()::{lambda((auto:1)...)#1}::operator()<int, int*>(int, int*) const + +_ZZ2L1vENKUlDpT_E_clIJiPiEEEDaS0_ +auto L1()::{lambda((auto:1)...)#1}::operator()<int, int*>(int, int*) const + |