Skip to content

[ItaniumDemangle] Add template name to the substitutions list during demangling #108538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2024
Merged

[ItaniumDemangle] Add template name to the substitutions list during demangling #108538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libcxxabi/src/demangle/ItaniumDemangle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4336,6 +4336,7 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// parse them, take the second production.

if (TryToParseTemplateArgs && look() == 'I') {
Subs.push_back(Result);
Node *TA = getDerived().parseTemplateArgs();
if (TA == nullptr)
return nullptr;
Expand Down
3 changes: 3 additions & 0 deletions libcxxabi/test/test_demangle.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30024,6 +30024,9 @@ const char* cases[][2] =
// See https://github.com/itanium-cxx-abi/cxx-abi/issues/165.
{"_ZN1C1fIiEEvDTtlNS_UlT_TL0__E_EEE", "void C::f<int>(decltype(C::'lambda'(int, auto){}))"},

// See https://github.com/llvm/llvm-project/issues/108009.
{"_ZN3FooIiE6methodIb3BarEEvT0_IT_ES3_IiE", "void Foo<int>::method<bool, Bar>(Bar<bool>, Bar<int>)"},

// C++20 class type non-type template parameters:
{"_Z1fIXtl1BLPi0ELi1EEEEvv", "void f<B{(int*)0, 1}>()"},
{"_Z1fIXtl1BLPi32EEEEvv", "void f<B{(int*)32}>()"},
Expand Down
1 change: 1 addition & 0 deletions llvm/include/llvm/Demangle/ItaniumDemangle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4336,6 +4336,7 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
// parse them, take the second production.

if (TryToParseTemplateArgs && look() == 'I') {
Subs.push_back(Result);
Node *TA = getDerived().parseTemplateArgs();
if (TA == nullptr)
return nullptr;
Expand Down
Loading