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

[Distributed] Fix generic returning distributed funcs

Browse Source
This commit is contained in:
Konrad `ktoso` Malawski
2022-03-09 19:17:05 +09:00
parent 67c097a373
commit ef10cd016a
5 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Sema/CodeSynthesisDistributedActor.cpp
View File

@@ -55,7 +55,7 @@ static VarDecl *addImplicitDistributedActorIDProperty(
// ==== Synthesize and add 'id' property to the actor decl
Type propertyType = getDistributedActorIDType(nominal);
VarDecl *propDecl = new (C)
auto *propDecl = new (C)
VarDecl(/*IsStatic*/false, VarDecl::Introducer::Let,
SourceLoc(), C.Id_id, nominal);
propDecl->setImplicit();
@@ -230,7 +230,7 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
// --- Recording invocation details
// -- recordGenericSubstitution(s)
if (func->isGeneric() || nominal->isGeneric()) {
if (thunk->isGeneric() || nominal->isGeneric()) {
auto recordGenericSubstitutionDecl =
C.getRecordGenericSubstitutionOnDistributedInvocationEncoder(invocationEncoderDecl);
assert(recordGenericSubstitutionDecl);
@@ -238,12 +238,13 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
UnresolvedDeclRefExpr::createImplicit(
C, recordGenericSubstitutionDecl->getName());
auto sig = func->getGenericSignature();
for (auto genParamType : sig.getGenericParams()) {
auto signature = thunk->getGenericSignature();
for (auto genParamType : signature.getGenericParams()) {
auto tyExpr = TypeExpr::createImplicit(thunk->mapTypeIntoContext(genParamType), C);
auto subTypeExpr = new (C) DotSelfExpr(
TypeExpr::createImplicit(thunk->mapTypeIntoContext(genParamType), C),
sloc, sloc, thunk->mapTypeIntoContext(genParamType));
tyExpr,
sloc, sloc, tyExpr->getType());
auto recordGenericSubArgsList =
ArgumentList::forImplicitCallTo(
@@ -378,7 +379,8 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
// -- recordReturnType
if (!isVoidReturn) {
// Result.self
auto resultType = func->getResultInterfaceType();
// Watch out and always map into thunk context
auto resultType = thunk->mapTypeIntoContext(func->getResultInterfaceType());
auto *metaTypeRef = TypeExpr::createImplicit(resultType, C);
auto *resultTypeExpr =
new (C) DotSelfExpr(metaTypeRef, sloc, sloc, resultType);
@@ -426,9 +428,8 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
}
// === Prepare the 'RemoteCallTarget'
VarDecl *targetVar =
new (C) VarDecl(/*isStatic=*/false, VarDecl::Introducer::Let, sloc,
C.Id_target, thunk);
auto *targetVar = new (C) VarDecl(
/*isStatic=*/false, VarDecl::Introducer::Let, sloc, C.Id_target, thunk);
{
// --- Mangle the thunk name
@@ -510,7 +511,8 @@ deriveBodyDistributed_thunk(AbstractFunctionDecl *thunk, void *context) {
// -- returning: Res.Type
if (!isVoidReturn) {
// Result.self
auto resultType = func->getResultInterfaceType();
auto resultType =
func->mapTypeIntoContext(func->getResultInterfaceType());
auto *metaTypeRef = TypeExpr::createImplicit(resultType, C);
auto *resultTypeExpr =
new (C) DotSelfExpr(metaTypeRef, sloc, sloc, resultType);
@@ -561,7 +563,7 @@ static FuncDecl *createDistributedThunkFunction(FuncDecl *func) {
genericParamList = genericParams->clone(DC);
}
GenericSignature thunkGenSig =
GenericSignature baseSignature =
buildGenericSignature(C, func->getGenericSignature(),
/*addedParameters=*/{},
/*addedRequirements=*/{});
@@ -581,9 +583,9 @@ static FuncDecl *createDistributedThunkFunction(FuncDecl *func) {
}
auto paramDecl = new (C)
ParamDecl(SourceLoc(),
/*argumentNameLoc=*/SourceLoc(), funcParam->getArgumentName(),
/*parameterNameLoc=*/SourceLoc(), paramName, DC);
ParamDecl(SourceLoc(),
/*argumentNameLoc=*/SourceLoc(), funcParam->getArgumentName(),
/*parameterNameLoc=*/SourceLoc(), paramName, DC);
paramDecl->setImplicit(true);
paramDecl->setSpecifier(funcParam->getSpecifier());
@@ -593,16 +595,14 @@ static FuncDecl *createDistributedThunkFunction(FuncDecl *func) {
}
ParameterList *params = ParameterList::create(C, paramDecls); // = funcParams->clone(C);
auto thunk = FuncDecl::createImplicit(C, swift::StaticSpellingKind::None,
thunkName, SourceLoc(),
/*async=*/true, /*throws=*/true,
genericParamList,
params,
func->getResultInterfaceType(),
DC);
auto thunk = FuncDecl::createImplicit(
C, swift::StaticSpellingKind::None, thunkName, SourceLoc(),
/*async=*/true, /*throws=*/true,
genericParamList, params,
func->getResultInterfaceType(), DC);
thunk->setSynthesized(true);
thunk->getAttrs().add(new (C) NonisolatedAttr(/*implicit=*/true));
thunk->setGenericSignature(thunkGenSig);
thunk->getAttrs().add(new (C) NonisolatedAttr(/*isImplicit=*/true));
thunk->setGenericSignature(baseSignature);
thunk->copyFormalAccessFrom(func, /*sourceIsParentContext=*/false);
thunk->setBodySynthesizer(deriveBodyDistributed_thunk, func);