diff options
| author | Jason Merrill <jason@redhat.com> | 2020-12-21 17:36:25 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-12-21 21:13:41 -0500 |
| commit | 58fb912c15175f4444144b8a4ab52a4880b84994 (patch) | |
| tree | 30eb36cd8436ac5f9d9dc3d0b4f4e56018450252 /libiberty/cp-demangle.h | |
| parent | 93ac0c05ffc84acba8e73ed5238fc325044378e0 (diff) | |
| download | gcc-58fb912c15175f4444144b8a4ab52a4880b84994.tar.gz | |
c++: Fix demangling of <unresolved-name>
The ABI for unresolved scoped names on the RHS of . and -> used to be
sr <type> <unqualified-id>
That changed years ago to something more complex, but G++ was never updated.
This change was particularly incompatible for simple qualified-ids like
A::x, which were previously mangled as sr1A1x, and now sr1AE1x.
This obviously makes life hard for demanglers, which can't know whether to
consume that E or not. To work around this, we now try demangling with the
newer ABI, and if that fails and we saw an "sr", try again with the older
ABI.
libiberty/ChangeLog:
PR c++/67343
* cp-demangle.h (struct d_info): Add unresolved_name_state.
* cp-demangle.c (d_prefix): Add subst parm.
(d_nested_name): Pass it.
(d_unresolved_name): Split out from...
(d_expression_1): ...here.
(d_demangle_callback): Maybe retry with old sr mangling.
* testsuite/demangle-expected: Add test.
Diffstat (limited to 'libiberty/cp-demangle.h')
| -rw-r--r-- | libiberty/cp-demangle.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h index 943a3ef478e..27014cde258 100644 --- a/libiberty/cp-demangle.h +++ b/libiberty/cp-demangle.h @@ -122,6 +122,10 @@ struct d_info /* Non-zero if we are parsing the type operand of a conversion operator, but not when in an expression. */ int is_conversion; + /* 1: using new unresolved-name grammar. + -1: using new unresolved-name grammar and saw an unresolved-name. + 0: using old unresolved-name grammar. */ + int unresolved_name_state; /* If DMGL_NO_RECURSE_LIMIT is not active then this is set to the current recursion level. */ unsigned int recursion_level; |