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

Create a uniform representation for function type isolation.

Browse Source 
Not quite NFC because apparently the representation bleeds into what's
accepted in some situations where we're supposed to be warning about
conflicts and then making an arbitrary choice.  But what we're doing
is nonsense, so we definitely need to break behavior here.

This is setting up for isolated(any) and isolated(caller).  I tried
to keep that out of the patch as much as possible, though.
This commit is contained in:
John McCall
2024-01-25 14:04:47 -05:00
parent 991a6de207
commit b0fb03d8c7
25 changed files with 448 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Serialization/Deserialization.cpp
View File

@@ -6660,17 +6660,17 @@ detail::function_deserializer::deserialize(ModuleFile &MF,
TypeID thrownErrorID;
GenericSignature genericSig;
TypeID clangTypeID;
TypeID globalActorTypeID;
TypeID rawIsolation;
if (!isGeneric) {
decls_block::FunctionTypeLayout::readRecord(
scratch, resultID, rawRepresentation, clangTypeID, noescape, concurrent,
async, throws, thrownErrorID, rawDiffKind, globalActorTypeID);
async, throws, thrownErrorID, rawDiffKind, rawIsolation);
} else {
GenericSignatureID rawGenericSig;
decls_block::GenericFunctionTypeLayout::readRecord(
scratch, resultID, rawRepresentation, concurrent, async, throws,
thrownErrorID, rawDiffKind, globalActorTypeID, rawGenericSig);
thrownErrorID, rawDiffKind, rawIsolation, rawGenericSig);
genericSig = MF.getGenericSignature(rawGenericSig);
clangTypeID = 0;
}
@@ -6700,19 +6700,27 @@ detail::function_deserializer::deserialize(ModuleFile &MF,
clangFunctionType = loadedClangType.get();
}
Type globalActor;
if (globalActorTypeID) {
auto isolation = swift::FunctionTypeIsolation::forNonIsolated();
if (rawIsolation == unsigned(FunctionTypeIsolation::NonIsolated)) {
// do nothing
} else if (rawIsolation == unsigned(FunctionTypeIsolation::Parameter)) {
isolation = swift::FunctionTypeIsolation::forParameter();
} else if (rawIsolation == unsigned(FunctionTypeIsolation::Dynamic)) {
isolation = swift::FunctionTypeIsolation::forDynamic();
} else {
TypeID globalActorTypeID =
rawIsolation - unsigned(FunctionTypeIsolation::GlobalActorOffset);
auto globalActorTy = MF.getTypeChecked(globalActorTypeID);
if (!globalActorTy)
return globalActorTy.takeError();
globalActor = globalActorTy.get();
isolation = swift::FunctionTypeIsolation::forGlobalActor(globalActorTy.get());
}
// TODO: Handle LifetimeDependenceInfo here.
auto info = FunctionType::ExtInfoBuilder(
*representation, noescape, throws, thrownError, *diffKind,
clangFunctionType, globalActor, LifetimeDependenceInfo())
clangFunctionType, isolation, LifetimeDependenceInfo())
.withConcurrent(concurrent)
.withAsync(async)
.build();