@@ -3216,21 +3216,6 @@ class DeclDeserializer {
3216
3216
decl.get <ExtensionDecl *>()->setInherited (inherited);
3217
3217
}
3218
3218
3219
- void handleInherited (ProtocolDecl *P,
3220
- ArrayRef<ProtocolDecl *> inherited) {
3221
- SmallVector<InheritedEntry, 2 > inheritedTypes;
3222
- llvm::transform (inherited, std::back_inserter (inheritedTypes), [](auto *I) {
3223
- return InheritedEntry (TypeLoc::withoutLoc (I->getDeclaredInterfaceType ()),
3224
- /* isUnchecked=*/ false ,
3225
- /* isRetroactive=*/ false ,
3226
- /* isPreconcurrency=*/ false );
3227
- });
3228
-
3229
- P->setInherited (ctx.AllocateCopy (inheritedTypes));
3230
- ctx.evaluator .cacheOutput (InheritedProtocolsRequest{P},
3231
- ctx.AllocateCopy (inherited));
3232
- }
3233
-
3234
3219
public:
3235
3220
DeclDeserializer (ModuleFile &MF, Serialized<Decl *> &declOrOffset)
3236
3221
: MF(MF), ctx(MF.getContext()), declOrOffset(declOrOffset) {}
@@ -4517,7 +4502,8 @@ class DeclDeserializer {
4517
4502
if (!MF.readInheritedProtocols (inherited))
4518
4503
return MF.diagnoseFatal ();
4519
4504
4520
- handleInherited (proto, inherited);
4505
+ ctx.evaluator .cacheOutput (InheritedProtocolsRequest{proto},
4506
+ ctx.AllocateCopy (inherited));
4521
4507
4522
4508
auto genericParams = MF.maybeReadGenericParams (DC);
4523
4509
assert (genericParams && " protocol with no generic parameters?" );
0 commit comments