Mangling: demangling/remangling of property behavior conformances

Author: eeckstein

lib/Basic/Demangle.cpp

@@ -3610,12 +3610,22 @@ void NodePrinter::print(NodePointer pointer, bool asContext, bool suppressType)
     NodePointer child0 = pointer->getChild(0);
     NodePointer child1 = pointer->getChild(1);
     NodePointer child2 = pointer->getChild(2);
-    print(child0);
-    if (Options.DisplayProtocolConformances) {
+    if (pointer->getNumChildren() == 4) {
+      // TODO: check if this is correct
+      Printer << "property behavior storage of ";
+      print(child2);
+      Printer << " in ";
+      print(child0);
       Printer << " : ";
       print(child1);
-      Printer << " in ";
-      print(child2);
+    } else {
+      print(child0);
+      if (Options.DisplayProtocolConformances) {
+        Printer << " : ";
+        print(child1);
+        Printer << " in ";
+        print(child2);
+      }
     }
     return;
   }

lib/Basic/Demangler.cpp

@@ -1020,12 +1020,20 @@ NodePointer Demangler::popProtocolConformance() {
   NodePointer Module = popModule();
   NodePointer Proto = popProtocol();
   NodePointer Type = popNode(Node::Kind::Type);
+  NodePointer Ident;
+  if (!Type) {
+    // Property behavior conformance
+    Ident = popNode(Node::Kind::Identifier);
+    Type = popNode(Node::Kind::Type);
+  }
   if (GenSig) {
     Type = createType(createWithChildren(Node::Kind::DependentGenericType,
                                          GenSig, Type));
   }
-  return createWithChildren(Node::Kind::ProtocolConformance,
-                            Type, Proto, Module);
+  NodePointer Conf = createWithChildren(Node::Kind::ProtocolConformance,
+                                        Type, Proto, Module);
+  addChild(Conf, Ident);
+  return Conf;
 }
 
 NodePointer Demangler::demangleThunkOrSpecialization() {

lib/Basic/Remangler.cpp

@@ -1354,6 +1354,8 @@ void Remangler::mangleProtocolConformance(Node *node) {
     Ty = Ty->getChild(1).get();
   }
   mangle(Ty);
+  if (node->getNumChildren() == 4)
+    mangleChildNode(node, 3);
   manglePureProtocol(node->getChild(1).get());
   mangleChildNode(node, 2);
   if (GenSig)