Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

include/swift/Serialization/ModuleFile.h

@@ -48,6 +48,7 @@ class ModuleFile
   : public LazyMemberLoader,
     public LazyConformanceLoader {
   friend class SerializedASTFile;
+  friend class DeclDeserializer;
   friend class SILDeserializer;
   using Status = serialization::Status;
   using TypeID = serialization::TypeID;
@@ -526,10 +527,6 @@ class ModuleFile
   std::unique_ptr<SerializedDeclMembersTable>
   readDeclMembersTable(ArrayRef<uint64_t> fields, StringRef blobData);
 
-  /// Main logic of getDeclChecked.
-  llvm::Expected<Decl *>
-  getDeclCheckedImpl(serialization::DeclID DID);
-
   /// Reads the index block, which contains global tables.
   ///
   /// Returns false if there was an error.