averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

NCGenerics: rebuild stdlib from its interface

Browse Source 
When a NoncopyableGenericsMismatch happens between the compiler and
stdlib, allow the compiler to rebuild the stdlib from its interface
instead of exiting with an error.
This commit is contained in:
Kavon Farvardin
2024-02-15 15:11:32 -08:00
parent 7e4761a751
commit 08b71e0136
34 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -318,8 +318,8 @@ struct ModuleRebuildInfo {
return "compiled with a different version of the compiler";
case Status::NotInOSSA:
return "module was not built with OSSA";
case Status::NotUsingNoncopyableGenerics:
return "module was not built with NoncopyableGenerics";
case Status::NoncopyableGenericsMismatch:
return "module was not built with matching NoncopyableGenerics feature";
case Status::MissingDependency:
return "missing dependency";
case Status::MissingUnderlyingModule:
@@ -869,7 +869,10 @@ class ModuleInterfaceLoaderImpl {
loadMode == ModuleLoadingMode::PreferSerialized &&
!version::isCurrentCompilerTagged() &&
rebuildInfo.getOrInsertCandidateModule(adjacentMod).serializationStatus !=
serialization::Status::SDKMismatch) {
serialization::Status::SDKMismatch &&
// FIXME(kavon): temporary while we bootstrap NoncopyableGenerics.
rebuildInfo.getOrInsertCandidateModule(adjacentMod).serializationStatus !=
serialization::Status::NoncopyableGenericsMismatch) {
// Special-case here: If we're loading a .swiftmodule from the resource
// dir adjacent to the compiler, defer to the serialized loader instead
// of falling back. This is to support local development of Swift,
@@ -1933,7 +1936,13 @@ InterfaceSubContextDelegateImpl::getCacheHash(StringRef useInterfacePath,
//
// If OSSA modules are enabled, we use a separate namespace of modules to
// ensure that we compile all swift interface files with the option set.
unsigned(genericSubInvocation.getSILOptions().EnableOSSAModules));
unsigned(genericSubInvocation.getSILOptions().EnableOSSAModules),
// Whether or not NoncopyableGenerics are enabled, as that influences
// many things like generic signatures and conformances.
unsigned(genericSubInvocation.getLangOptions()
.hasFeature(Feature::NoncopyableGenerics))
);
return llvm::toString(llvm::APInt(64, H), 36, /*Signed=*/false);
}