Merge pull request #72654 from al45tair/eng/PR-125350219-6.0

al45tair · web-flow · commit abbeec330e23 · 2024-03-28T17:44:07.000Z
[Demangler] Fix assertion failure.
diff --git a/lib/Demangling/Demangler.cpp b/lib/Demangling/Demangler.cpp
@@ -3134,9 +3134,9 @@ NodePointer Demangler::demangleLifetimeDependenceKind(bool isSelfDependence) {
     return createNode(Node::Kind::SelfLifetimeDependence,
                       (Node::IndexType)kind);
   }
-  auto node = createNode(Node::Kind::ParamLifetimeDependence);
-  node->addChild(createNode(Node::Kind::Index, unsigned(kind)), *this);
-  node->addChild(popTypeAndGetChild(), *this);
+  auto node = createWithChildren(Node::Kind::ParamLifetimeDependence,
+                                 createNode(Node::Kind::Index, unsigned(kind)),
+                                 popTypeAndGetChild());
   return createType(node);
 }
 
diff --git a/test/Demangle/Inputs/objc-getclass.txt b/test/Demangle/Inputs/objc-getclass.txt
@@ -23,3 +23,6 @@ SlSIxip6/XXS*”PLEPÓd}}}}}}}
 
 # rdar://68449341
 ySfmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmf%mmmmmmmmmmmmmf%w
+
+# rdar://125350219
+8PDDoKcinYlistSi_natureNatur^natu`Dnat1

Original file line number	Diff line number	Diff line change
`@@ -3134,9 +3134,9 @@ NodePointer Demangler::demangleLifetimeDependenceKind(bool isSelfDependence) {`
`3134`	`3134`	`return createNode(Node::Kind::SelfLifetimeDependence,`
`3135`	`3135`	`(Node::IndexType)kind);`
`3136`	`3136`	`}`
`3137`		`- auto node = createNode(Node::Kind::ParamLifetimeDependence);`
`3138`		`- node->addChild(createNode(Node::Kind::Index, unsigned(kind)), *this);`
`3139`		`- node->addChild(popTypeAndGetChild(), *this);`
	`3137`	`+ auto node = createWithChildren(Node::Kind::ParamLifetimeDependence,`
	`3138`	`+ createNode(Node::Kind::Index, unsigned(kind)),`
	`3139`	`+ popTypeAndGetChild());`
`3140`	`3140`	`return createType(node);`
`3141`	`3141`	`}`
`3142`	`3142`