Skip to content

Commit d20b9a8

Browse files
authored
Merge pull request #59170 from al45tair/eng/PR-94143700
[Demangler] Fix a NULL Node pointer assertion.
2 parents 46a746b + 5ffcaad commit d20b9a8

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/Demangling/Demangler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,7 @@ NodePointer Demangler::demangleImplFunctionType() {
19771977
FAttrNode->addChild(
19781978
createNode(Node::Kind::ImplFunctionConventionName, FConv), *this);
19791979
if (hasClangType)
1980-
FAttrNode->addChild(demangleClangType(), *this);
1980+
addChild(FAttrNode, demangleClangType());
19811981
type->addChild(FAttrNode, *this);
19821982
}
19831983

test/Demangle/Inputs/manglings.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,5 @@ $s4test3FooVAAyyAA1P_pyxqd__XPlF ---> test.Foo.test<A>(test.P<A, A1>) -> ()
431431
$s4test3FooVAAyyAA1P_pyxXPF ---> test.Foo.test(test.P<A>) -> ()
432432
$s4test3FooVAAyyAA1P_pF ---> test.Foo.test(test.P) -> ()
433433
$s4test3FooVAAyyAA1P_pyqd__XPAaDRd__lF ---> test.Foo.test<A where A1: test.P>(test.P<A1>) -> ()
434-
434+
$sxxxIxzCXxxxesy -> $sxxxIxzCXxxxesy
435+
$Sxxx_x_xxIxzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC$x -> $Sxxx_x_xxIxzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC$x

0 commit comments

Comments
 (0)