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

2025-12-14 20:36:38 +01:00 · 2020-07-01 17:59:25 -07:00
parent f8e4844e13 3e8166eab5
commit d883300bc1
13 changed files with 274 additions and 218 deletions
--- a/lib/Serialization/SerializedModuleLoader.cpp
+++ b/lib/Serialization/SerializedModuleLoader.cpp
@@ -367,13 +367,14 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
  // Load the module file without validation.
  std::unique_ptr<ModuleFile> loadedModuleFile;
  bool isFramework = false;
+  serialization::ExtendedValidationInfo extInfo;
  serialization::ValidationInfo loadInfo =
      ModuleFile::load(modulePath.str(),
                       std::move(moduleBuf.get()),
                       nullptr,
                       nullptr,
                       isFramework, loadedModuleFile,
-                       nullptr);
+                       &extInfo);

  // Map the set of dependencies over to the "module dependencies".
  auto dependencies = ModuleDependencies::forSwiftModule(modulePath.str());