Fixes for the 5.5 branch

Author: DougGregor

lib/Sema/DerivedConformanceCodable.cpp

@@ -160,8 +160,8 @@ static EnumDecl *addImplicitCaseCodingKeys(EnumDecl *target,
 
   auto *codingKeyProto = C.getProtocol(KnownProtocolKind::CodingKey);
   auto codingKeyType = codingKeyProto->getDeclaredInterfaceType();
-  TypeLoc protoTypeLoc[1] = {TypeLoc::withoutLoc(codingKeyType)};
-  ArrayRef<TypeLoc> inherited = C.AllocateCopy(protoTypeLoc);
+  InheritedEntry protoTypeLoc[1] = {InheritedEntry(TypeLoc::withoutLoc(codingKeyType))};
+  ArrayRef<InheritedEntry> inherited = C.AllocateCopy(protoTypeLoc);
 
   // Only derive if this case exist in the CodingKeys enum
   auto *codingKeyCase =
@@ -222,8 +222,8 @@ static EnumDecl *addImplicitCodingKeys(NominalTypeDecl *target) {
   // enum cases based on those var names.
   auto *codingKeyProto = C.getProtocol(KnownProtocolKind::CodingKey);
   auto codingKeyType = codingKeyProto->getDeclaredInterfaceType();
-  TypeLoc protoTypeLoc[1] = {TypeLoc::withoutLoc(codingKeyType)};
-  ArrayRef<TypeLoc> inherited = C.AllocateCopy(protoTypeLoc);
+  InheritedEntry protoTypeLoc[1] = {InheritedEntry(TypeLoc::withoutLoc(codingKeyType))};
+  ArrayRef<InheritedEntry> inherited = C.AllocateCopy(protoTypeLoc);
 
   auto *enumDecl = new (C) EnumDecl(SourceLoc(), C.Id_CodingKeys, SourceLoc(),
                                     inherited, nullptr, target);

lib/Sema/DerivedConformanceDifferentiable.cpp

@@ -341,7 +341,7 @@ static ValueDecl *deriveDifferentiable_move(DerivedConformance &derived) {
 ///
 /// Precondition: `decl` is a nominal type decl or an extension decl.
 void getInheritedProtocols(Decl *decl, SmallPtrSetImpl<ProtocolDecl *> &protos) {
-  ArrayRef<TypeLoc> inheritedTypeLocs;
+  ArrayRef<InheritedEntry> inheritedTypeLocs;
   if (auto *nominalDecl = dyn_cast<NominalTypeDecl>(decl))
     inheritedTypeLocs = nominalDecl->getInherited();
   else if (auto *extDecl = dyn_cast<ExtensionDecl>(decl))