Implement typeref to demangle tree conversion for nested bound generics

rdar://90218547

Author: augusto2112

stdlib/public/Reflection/TypeRef.cpp

@@ -609,6 +609,25 @@ class DemanglingForTypeRef
     nominalNode->addChild(parentNode, Dem);
     nominalNode->addChild(identifierNode, Dem);
 
+    // Peel off the "Type" node.
+    parentNode = parentNode->getFirstChild();
+
+    auto nominalNode = unspecializedType->getFirstChild();  
+
+    if (nominalNode->getNumChildren() != 2)
+      return genericNode;
+
+    // Save identifier for reinsertion later, we have to remove it
+    // so we can insert the parent node as the first child.
+    auto identifierNode = nominalNode->getLastChild();
+
+    // Remove all children.
+    nominalNode->removeChildAt(1);
+    nominalNode->removeChildAt(0);
+    
+    // Add the parent we just visited back in, followed by the identifier.
+    nominalNode->addChild(parentNode, Dem);
+    nominalNode->addChild(identifierNode, Dem);
     return genericNode;
   }