[Serialization] Form protocol's inherited types based on deserialized protocols

Author: xedin

lib/Serialization/Deserialization.cpp

@@ -3214,6 +3214,21 @@ class DeclDeserializer {
       decl.get<ExtensionDecl *>()->setInherited(inherited);
   }
 
+  void handleInherited(ProtocolDecl *P,
+                       ArrayRef<ProtocolDecl *> inherited) {
+    SmallVector<InheritedEntry, 2> inheritedTypes;
+    llvm::transform(inherited, std::back_inserter(inheritedTypes), [](auto *I) {
+      return InheritedEntry(TypeLoc::withoutLoc(I->getDeclaredInterfaceType()),
+                            /*isUnchecked=*/false,
+                            /*isRetroactive=*/false,
+                            /*isPreconcurrency=*/false);
+    });
+
+    P->setInherited(ctx.AllocateCopy(inheritedTypes));
+    ctx.evaluator.cacheOutput(InheritedProtocolsRequest{P},
+                              ctx.AllocateCopy(inherited));
+  }
+
 public:
   DeclDeserializer(ModuleFile &MF, Serialized<Decl *> &declOrOffset)
       : MF(MF), ctx(MF.getContext()), declOrOffset(declOrOffset) {}
@@ -4499,8 +4514,8 @@ class DeclDeserializer {
     SmallVector<ProtocolDecl *, 2> inherited;
     if (!MF.readInheritedProtocols(inherited))
       return MF.diagnoseFatal();
-    ctx.evaluator.cacheOutput(InheritedProtocolsRequest{proto},
-                              ctx.AllocateCopy(inherited));
+
+    handleInherited(proto, inherited);
 
     auto genericParams = MF.maybeReadGenericParams(DC);
     assert(genericParams && "protocol with no generic parameters?");

test/api-digester/Outputs/cake-abi.json

@@ -107,19 +107,19 @@
         "genericSig": "<τ_0_0 : cake.P1, τ_0_0 : cake.P2>",
         "sugared_genericSig": "<Self : cake.P1, Self : cake.P2>",
         "conformances": [
-          {
-            "kind": "Conformance",
-            "name": "P2",
-            "printedName": "P2",
-            "usr": "s:4cake2P2P",
-            "mangledName": "$s4cake2P2P"
-          },
           {
             "kind": "Conformance",
             "name": "P1",
             "printedName": "P1",
             "usr": "s:4cake2P1P",
             "mangledName": "$s4cake2P1P"
+          },
+          {
+            "kind": "Conformance",
+            "name": "P2",
+            "printedName": "P2",
+            "usr": "s:4cake2P2P",
+            "mangledName": "$s4cake2P2P"
           }
         ]
       },

test/api-digester/Outputs/cake.json

@@ -105,19 +105,19 @@
         "moduleName": "cake",
         "genericSig": "<Self : cake.P1, Self : cake.P2>",
         "conformances": [
-          {
-            "kind": "Conformance",
-            "name": "P2",
-            "printedName": "P2",
-            "usr": "s:4cake2P2P",
-            "mangledName": "$s4cake2P2P"
-          },
           {
             "kind": "Conformance",
             "name": "P1",
             "printedName": "P1",
             "usr": "s:4cake2P1P",
             "mangledName": "$s4cake2P1P"
+          },
+          {
+            "kind": "Conformance",
+            "name": "P2",
+            "printedName": "P2",
+            "usr": "s:4cake2P2P",
+            "mangledName": "$s4cake2P2P"
           }
         ]
       },