Skip to content

ref(demangle): Add backward compat patch for swift demangler #981

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
Dav1dde merged 3 commits into from
May 19, 2026
+26 −0
Merged

ref(demangle): Add backward compat patch for swift demangler #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
810016d
re-introduce test
Dav1dde May 18, 2026
c5a1d9d
add patch
Dav1dde May 18, 2026
03263fc
apply patch
Dav1dde May 18, 2026
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 symbolic-demangle/tests/test_swift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ fn test_demangle_swift_no_args() {

// Swift 6.0.3
"$ss27withTaskCancellationHandler9operation8onCancel9isolationxxyYaKXE_yyYbXEScA_pSgYitYaKlFTwb" => "withTaskCancellationHandler<A>",
"$s11Supercharge2AXO7ElementPAAE8elements33_35EDDAA799FBB5B74D2F426690B0D99DLL3for2asSayqd__GSo28NSAccessibilityAttributeNamea_qd__mtSo7AXErrorVYKAcDRd__lFAC3AppC_AC6WindowCTgm5" => "specialized AX.Element.elements<A>",

// Swift 6.1.0
"$sTB" => "$sTB",
Expand Down
21 changes: 21 additions & 0 deletions symbolic-demangle/vendor/swift/2-metatype-compat.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
commit 444bc9275ef9876c9b8404e4c2e8982868376bb6
Author: David Herberth <david.herberth@sentry.io>
Date: Mon May 18 19:07:06 2026 +0200

apply patch

diff --git a/symbolic-demangle/vendor/swift/lib/Demangling/Demangler.cpp b/symbolic-demangle/vendor/swift/lib/Demangling/Demangler.cpp
index 4f7bbbcb..d88fda74 100644
--- a/symbolic-demangle/vendor/swift/lib/Demangling/Demangler.cpp
+++ b/symbolic-demangle/vendor/swift/lib/Demangling/Demangler.cpp
@@ -3619,6 +3619,10 @@ NodePointer Demangler::addFuncSpecParamNumber(NodePointer Param,
}

NodePointer Demangler::demangleSpecAttributes(Node::Kind SpecKind) {
+ // Swift used 'm' for `MetatypeParamsRemoved`, with the 6.3 update it was removed.
+ // To keep old mangled strings compatible with `symbolic` we skip `m` here.
+ (void) nextIf('m');
+
bool isSerialized = nextIf('q');
bool asyncRemoved = nextIf('a');
bool representationChanged = nextIf('r');
4 changes: 4 additions & 0 deletions symbolic-demangle/vendor/swift/lib/Demangling/Demangler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3619,6 +3619,10 @@ NodePointer Demangler::addFuncSpecParamNumber(NodePointer Param,
}

NodePointer Demangler::demangleSpecAttributes(Node::Kind SpecKind) {
// Swift used 'm' for `MetatypeParamsRemoved`, with the 6.3 update it was removed.
// To keep old mangled strings compatible with `symbolic` we skip `m` here.
(void) nextIf('m');

bool isSerialized = nextIf('q');
bool asyncRemoved = nextIf('a');
bool representationChanged = nextIf('r');
Expand Down
Loading