Skip to content

Commit 2d85fb3

Browse files
authored
Merge pull request #9878 from eeckstein/fix-demangler-4.0
Demangler: don’t crash if demangling a malformed KeyPath[GS]etterThunkHelper
2 parents 3fcc747 + b23158c commit 2d85fb3

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/Demangling/Demangler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,8 @@ NodePointer Demangler::demangleThunkOrSpecialization() {
12631263
: Node::Kind::KeyPathSetterThunkHelper;
12641264
auto type = popNode();
12651265
auto sigOrDecl = popNode();
1266-
if (sigOrDecl->getKind() == Node::Kind::DependentGenericSignature) {
1266+
if (sigOrDecl &&
1267+
sigOrDecl->getKind() == Node::Kind::DependentGenericSignature) {
12671268
auto decl = popNode();
12681269
return createWithChildren(nodeKind, decl, sigOrDecl, type);
12691270
} else {

test/Demangle/Inputs/manglings.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,5 @@ _T010Foundation11MeasurementV12SimulatorKitSo9UnitAngleCRszlE11OrientationO2eeoi
253253
_T04main1_yyF ---> main._() -> ()
254254
_T04test6testitSiyt_tF ---> test.testit(()) -> Swift.Int
255255
_T0Rml ---> _T0Rml
256+
_T0Tk ---> _T0Tk
256257

0 commit comments

Comments
 (0)