Merge pull request #8271 from eeckstein/fix-ext-mangling

mangling: Correctly demangle + remangle extensions of generic types.

Author: eeckstein

lib/Demangling/Demangler.cpp

@@ -893,17 +893,22 @@ NodePointer Demangler::demangleBoundGenericArgs(NodePointer Nominal,
 
   if (TypeListIdx >= TypeLists.size())
     return nullptr;
-  NodePointer args = TypeLists[TypeListIdx];
+  NodePointer args = TypeLists[TypeListIdx++];
 
   // Generic arguments for the outermost type come first.
   NodePointer Context = Nominal->getFirstChild();
 
-  if (Context->getKind() != Node::Kind::Module &&
-      Context->getKind() != Node::Kind::Function &&
-      Context->getKind() != Node::Kind::Extension) {
-    NodePointer BoundParent = demangleBoundGenericArgs(Context, TypeLists,
-                                                       TypeListIdx + 1);
-
+  if (TypeListIdx < TypeLists.size()) {
+    NodePointer BoundParent = nullptr;
+    if (Context->getKind() == Node::Kind::Extension) {
+      BoundParent = demangleBoundGenericArgs(Context->getChild(1), TypeLists,
+                                             TypeListIdx);
+      BoundParent = createWithChildren(Node::Kind::Extension,
+                                       Context->getFirstChild(),
+                                       BoundParent);
+    } else {
+      BoundParent = demangleBoundGenericArgs(Context, TypeLists, TypeListIdx);
+    }
     // Rebuild this type with the new parent type, which may have
     // had its generic arguments applied.
     Nominal = createWithChildren(Nominal->getKind(), BoundParent,

lib/Demangling/Remangler.cpp

@@ -449,13 +449,11 @@ void Remangler::mangleGenericArgs(Node *node, char &Separator) {
   switch (node->getKind()) {
     case Node::Kind::Structure:
     case Node::Kind::Enum:
-    case Node::Kind::Class: {
-      NodePointer parentOrModule = node->getChild(0);
-      mangleGenericArgs(parentOrModule, Separator);
+    case Node::Kind::Class:
+      mangleGenericArgs(node->getChild(0), Separator);
       Buffer << Separator;
       Separator = '_';
       break;
-    }
 
     case Node::Kind::BoundGenericStructure:
     case Node::Kind::BoundGenericEnum:
@@ -471,6 +469,10 @@ void Remangler::mangleGenericArgs(Node *node, char &Separator) {
       break;
     }
 
+    case Node::Kind::Extension:
+      mangleGenericArgs(node->getChild(1), Separator);
+      break;
+
     default:
       break;
   }
@@ -1741,13 +1743,11 @@ bool Demangle::isSpecialized(Node *node) {
 
     case Node::Kind::Structure:
     case Node::Kind::Enum:
-    case Node::Kind::Class: {
-      Node *parentOrModule = node->getChild(0);
-      if (isSpecialized(parentOrModule))
-        return true;
+    case Node::Kind::Class:
+      return isSpecialized(node->getChild(0));
 
-      return false;
-    }
+    case Node::Kind::Extension:
+      return isSpecialized(node->getChild(1));
 
     default:
       return false;
@@ -1781,6 +1781,15 @@ NodePointer Demangle::getUnspecialized(Node *node, NodeFactory &Factory) {
         return nominalType;
     }
 
+    case Node::Kind::Extension: {
+      NodePointer parent = node->getChild(1);
+      if (!isSpecialized(parent))
+        return node;
+      NodePointer result = Factory.createNode(Node::Kind::Extension);
+      result->addChild(node->getFirstChild(), Factory);
+      result->addChild(getUnspecialized(parent, Factory), Factory);
+      return result;
+    }
     default:
       unreachable("bad nominal type kind");
   }

test/Demangle/Inputs/manglings.txt

@@ -245,4 +245,4 @@ _T03foo4_123ABTf3psbpsb_n ---> function signature specialization <Arg[0] = [Cons
 _T04main5innerys5Int32Vz_yADctF25closure_with_box_argumentxz_Bi32__lXXTf1nc_n ---> function signature specialization <Arg[1] = [Closure Propagated : closure_with_box_argument, Argument Types : [<A> { var A } <Builtin.Int32>]> of main.inner (inout Swift.Int32, (Swift.Int32) -> ()) -> ()
 _T03foo6testityyyc_yyctF1a1bTf3pfpf_n ---> function signature specialization <Arg[0] = [Constant Propagated Function : a], Arg[1] = [Constant Propagated Function : b]> of foo.testit (() -> (), () -> ()) -> ()
 _SocketJoinOrLeaveMulticast ---> _SocketJoinOrLeaveMulticast
-
+_T0s10DictionaryV3t17E6Index2V1loiSbAEyxq__G_AGtFZ ---> static (extension in t17):Swift.Dictionary.Index2.< infix ((extension in t17):[A : B].Index2, (extension in t17):[A : B].Index2) -> Swift.Bool