Demangler: Register substitution for opaque archetype manglings

Author: jckarter

lib/Demangling/Demangler.cpp

@@ -1941,7 +1941,9 @@ NodePointer Demangler::demangleArchetype() {
       if (retroactiveConformances)
         opaque->addChild(retroactiveConformances, *this);
 
-      return createType(opaque);
+      auto opaqueTy = createType(opaque);
+      addSubstitution(opaqueTy);
+      return opaqueTy;
     }
     case 'r': {
       return createType(createNode(Node::Kind::OpaqueReturnType));

lib/Demangling/NodePrinter.cpp

@@ -2268,7 +2268,9 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
     Printer << ">>";
     return nullptr;
   case Node::Kind::OpaqueType:
-    printChildren(Node);
+    print(Node->getChild(0));
+    Printer << '.';
+    print(Node->getChild(1));
     return nullptr;
   case Node::Kind::AccessorFunctionReference:
     Printer << "accessor function at " << Node->getIndex();