Merge pull request #58388 from al45tair/eng/PR-91831405

al45tair · web-flow · commit e59c6c1ef5ba · 2022-04-27T10:32:11.000+01:00
[Demangling] Fix demangling of built generics to be more robust.
diff --git a/lib/Demangling/OldDemangler.cpp b/lib/Demangling/OldDemangler.cpp
@@ -1044,7 +1044,8 @@ class OldDemangler {
       // had its generic arguments applied.
       NodePointer result = Factory.createNode(nominalType->getKind());
       result->addChild(parentOrModule, Factory);
-      result->addChild(nominalType->getChild(1), Factory);
+      for (unsigned ndx = 1; ndx < nominalType->getNumChildren(); ++ndx)
+        result->addChild(nominalType->getChild(ndx), Factory);
 
       nominalType = result;
     }

Original file line number	Diff line number	Diff line change
`@@ -1044,7 +1044,8 @@ class OldDemangler {`
`1044`	`1044`	`// had its generic arguments applied.`
`1045`	`1045`	`NodePointer result = Factory.createNode(nominalType->getKind());`
`1046`	`1046`	`result->addChild(parentOrModule, Factory);`
`1047`		`- result->addChild(nominalType->getChild(1), Factory);`
	`1047`	`+ for (unsigned ndx = 1; ndx < nominalType->getNumChildren(); ++ndx)`
	`1048`	`+ result->addChild(nominalType->getChild(ndx), Factory);`
`1048`	`1049`
`1049`	`1050`	`nominalType = result;`
`1050`	`1051`	`}`