Merge commit '3eb82c183662945687f48e11c09828f551b34858' into master-next

# Conflicts: # include/swift/Frontend/FrontendInputsAndOutputs.h
2025-12-21 12:14:44 +01:00 · 2020-06-08 16:58:37 -07:00
parent 77cbdeedc8 3eb82c1836
commit 57ea964f2c
580 changed files with 9388 additions and 3418 deletions
--- a/lib/Serialization/SerializedModuleLoader.cpp
+++ b/lib/Serialization/SerializedModuleLoader.cpp
@@ -276,6 +276,12 @@ std::error_code SerializedModuleLoaderBase::openModuleDocFileIfPresent(
  return std::error_code();
 }

+std::unique_ptr<llvm::MemoryBuffer>
+SerializedModuleLoaderBase::getModuleName(ASTContext &Ctx, StringRef modulePath,
+                                          std::string &Name) {
+  return ModuleFile::getModuleName(Ctx, modulePath, Name);
+}
+
 std::error_code
 SerializedModuleLoaderBase::openModuleSourceInfoFileIfPresent(
    AccessPathElem ModuleID,