Manually merge remote-tracking branch 'upstream/master' into merge-m-to-mr

This commit is contained in:
Nathan Hawes
2020-07-27 22:41:53 -07:00
85 changed files with 2016 additions and 754 deletions

View File

@@ -613,7 +613,7 @@ class ModuleInterfaceLoaderImpl {
case ModuleLoadingMode::OnlySerialized:
llvm_unreachable("module interface loader should not have been created");
}
// [Note: ModuleInterfaceLoader-defer-to-SerializedModuleLoader]
// [NOTE: ModuleInterfaceLoader-defer-to-ImplicitSerializedModuleLoader]
// If there's a module adjacent to the .swiftinterface that we can
// _likely_ load (it validates OK and is up to date), bail early with
// errc::not_supported, so the next (serialized) loader in the chain will