Skip to content

[concurrency] some small bug fixes #34588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 5, 2020
Merged

[concurrency] some small bug fixes #34588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0accc02
[concurrency] SILVerifier: don't complain about async function pointe…
eeckstein Nov 5, 2020
f3de3b4
SIL: set the @async attribute for top-level functions correctly
eeckstein Nov 5, 2020
9fc1171
[concurrency] SILGen: only emit hop_to_executor instructions in async…
eeckstein Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/SIL/IR/TypeLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2511,6 +2511,7 @@ getFunctionInterfaceTypeWithCaptures(TypeConverter &TC,
auto innerExtInfo =
AnyFunctionType::ExtInfoBuilder(FunctionType::Representation::Thin,
funcType->isThrowing())
.withAsync(funcType->isAsync())
.build();

return CanAnyFunctionType::get(
Expand Down
8 changes: 0 additions & 8 deletions lib/SIL/Verifier/SILVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,8 +1595,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
verifySILFunctionType(resultInfo);
require(resultInfo->getExtInfo().hasContext(),
"result of closure cannot have a thin function type");
require(!resultInfo->isAsync() || PAI->getFunction()->isAsync(),
"cannot call an async function from a non async function");

checkApplyTypeDependentArguments(PAI);

Expand Down Expand Up @@ -1745,8 +1743,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
"result of function_ref");
require(!fnType->getExtInfo().hasContext(),
"function_ref should have a context-free function result");
require(!fnType->isAsync() || FRI->getFunction()->isAsync(),
"cannot call an async function from a non-async function");

// Note: in SingleFunction mode, we relax some of these checks because
// we may not have linked everything yet.
Expand Down Expand Up @@ -2921,8 +2917,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
void checkWitnessMethodInst(WitnessMethodInst *AMI) {
auto methodType = requireObjectType(SILFunctionType, AMI,
"result of witness_method");
require(!methodType->isAsync() || AMI->getFunction()->isAsync(),
"cannot call an async function from a non-async function");

auto *protocol
= dyn_cast<ProtocolDecl>(AMI->getMember().getDecl()->getDeclContext());
Expand Down Expand Up @@ -3078,8 +3072,6 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
"result of class_method");
require(!methodType->getExtInfo().hasContext(),
"result method must be of a context-free function type");
require(!methodType->isAsync() || CMI->getFunction()->isAsync(),
"cannot call an async function from a non-async function");

SILType operandType = CMI->getOperand()->getType();
require(operandType.isClassOrClassMetatype(),
Expand Down
3 changes: 3 additions & 0 deletions lib/SILGen/SILGenProlog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,9 @@ void SILGenFunction::emitProlog(CaptureInfo captureInfo,
}
}

if (!F.isAsync())
return;

if (auto *funcDecl =
dyn_cast_or_null<AbstractFunctionDecl>(FunctionDC->getAsDecl())) {
auto actorIsolation = getActorIsolation(funcDecl);
Expand Down
32 changes: 13 additions & 19 deletions test/IRGen/async/async_calls_verifier.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ bb0:
}

// CHECK-LABEL: Begin Error in function nonasync_apply_caller
// CHECK: SIL verification failed: cannot call an async function from a non-async function: !fnType->isAsync() || FRI->getFunction()->isAsync()
// CHECK: SIL verification failed: cannot call an async function from a non async function: !calleeConv.funcTy->isAsync() || AI->getFunction()->isAsync()
// CHECK: Verifying instruction:
// CHECK: -> // function_ref asynccallee1
// CHECK: // function_ref asynccallee1
// CHECK: %0 = function_ref @asynccallee1 : $@convention(thin) @async () -> () // user: %1
// CHECK: %1 = apply %0() : $@convention(thin) @async () -> ()
// CHECK: -> %1 = apply %0() : $@convention(thin) @async () -> ()
// CHECK-LABEL: End Error in function nonasync_apply_caller
sil [ossa] @nonasync_apply_caller : $@convention(thin) () -> () {
bb0:
Expand All @@ -62,11 +62,11 @@ bb2(%result_error : $Error):
}

// CHECK-LABEL: Begin Error in function nonasync_try_apply_caller
// CHECK: SIL verification failed: cannot call an async function from a non-async function: !fnType->isAsync() || FRI->getFunction()->isAsync()
// CHECK: SIL verification failed: cannot call an async function from a non async function: !calleeConv.funcTy->isAsync() || AI->getFunction()->isAsync()
// CHECK: Verifying instruction:
// CHECK: -> // function_ref asynccallee2
// CHECK: // function_ref asynccallee2
// CHECK: %0 = function_ref @asynccallee2 : $@convention(thin) @async () -> ((), @error Error) // user: %1
// CHECK: try_apply %0() : $@convention(thin) @async () -> ((), @error Error), normal bb1, error bb2 // id: %1
// CHECK: -> try_apply %0() : $@convention(thin) @async () -> ((), @error Error), normal bb1, error bb2 // id: %1
// CHECK-LABEL: End Error in function nonasync_try_apply_caller
sil [ossa] @nonasync_try_apply_caller : $@convention(thin) () -> () {
bb0:
Expand All @@ -86,13 +86,7 @@ bb0:
return %2 : $@async @callee_owned () -> ()
}

// CHECK-LABEL: Begin Error in function nonasync_partial_apply_caller
// CHECK: SIL verification failed: cannot call an async function from a non-async function: !fnType->isAsync() || FRI->getFunction()->isAsync()
// CHECK: Verifying instruction:
// CHECK: -> // function_ref asynccallee1
// CHECK: %0 = function_ref @asynccallee1 : $@convention(thin) @async () -> () // user: %1
// CHECK: %1 = partial_apply %0() : $@convention(thin) @async () -> () // user: %2
// CHECK-LABEL: End Error in function nonasync_partial_apply_caller
// CHECK-NOT: Function: 'nonasync_partial_apply_caller'
sil [ossa] @nonasync_partial_apply_caller : $@convention(thin) () -> @owned @async @callee_owned () -> () {
bb0:
%1 = function_ref @asynccallee1 : $@async @convention(thin) () -> ()
Expand All @@ -113,10 +107,10 @@ bb0(%t : $*T):
}

// CHECK-LABEL: Begin Error in function nonasync_witness_method_caller
// CHECK: SIL verification failed: cannot call an async function from a non-async function: !methodType->isAsync() || AMI->getFunction()->isAsync()
// CHECK: SIL verification failed: cannot call an async function from a non async function: !calleeConv.funcTy->isAsync() || AI->getFunction()->isAsync()
// CHECK: Verifying instruction:
// CHECK: -> %1 = witness_method $T, #P.printMe : <Self where Self : P> (Self) -> () async -> Int64 : $@convention(witness_method: P) @async <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int64 // user: %2
// CHECK: %2 = apply %1<T>(%0) : $@convention(witness_method: P) @async <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int64 // user: %3
// CHECK: %1 = witness_method $T, #P.printMe : <Self where Self : P> (Self) -> () async -> Int64 : $@convention(witness_method: P) @async <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int64 // user: %2
// CHECK: -> %2 = apply %1<T>(%0) : $@convention(witness_method: P) @async <τ_0_0 where τ_0_0 : P> (@in_guaranteed τ_0_0) -> Int64 // user: %3
// CHECK-LABEL: End Error in function nonasync_witness_method_caller
sil hidden @nonasync_witness_method_caller : $@convention(thin) <T where T : P> (@in_guaranteed T) -> Int64 {
bb0(%t : $*T):
Expand All @@ -141,11 +135,11 @@ bb0(%int : $Int64, %instance : $S):
}

// CHECK-LABEL: Begin Error in function nonasync_class_method_caller
// CHECK: SIL verification failed: cannot call an async function from a non-async function: !methodType->isAsync() || CMI->getFunction()->isAsync()
// CHECK: SIL verification failed: cannot call an async function from a non async function: !calleeConv.funcTy->isAsync() || AI->getFunction()->isAsync()
// CHECK: Verifying instruction:
// CHECK: %1 = argument of bb0 : $S // users: %3, %2
// CHECK: -> %2 = class_method %1 : $S, #S.method : (S) -> (Int64) async -> (), $@convention(method) @async (Int64, @guaranteed S) -> () // user: %3
// CHECK: %3 = apply %2(%0, %1) : $@convention(method) @async (Int64, @guaranteed S) -> ()
// CHECK: %2 = class_method %1 : $S, #S.method : (S) -> (Int64) async -> (), $@convention(method) @async (Int64, @guaranteed S) -> () // user: %3
// CHECK: -> %3 = apply %2(%0, %1) : $@convention(method) @async (Int64, @guaranteed S) -> ()
// CHECK-LABEL: End Error in function nonasync_class_method_caller
sil hidden @nonasync_class_method_caller : $@convention(thin) (Int64, S) -> () {
bb0(%int : $Int64, %instance : $S):
Expand Down
11 changes: 9 additions & 2 deletions test/SILGen/hop_to_executor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ actor class MyActor {
await callee(p)
}

// CHECK-LABEL: sil hidden [ossa] @$s4test7MyActorC13dontInsertHTESiyF : $@convention(method) (@guaranteed MyActor) -> Int {
// CHECK-NOT: hop_to_executor
// CHECK: } // end sil function '$s4test7MyActorC13dontInsertHTESiyF'
func dontInsertHTE() -> Int {
return p
}

init() {
p = 27
}
Expand All @@ -57,7 +64,7 @@ struct GlobalActor {
static var shared: MyActor = MyActor()
}

// CHECK-LABEL: sil hidden [ossa] @$s4test0A11GlobalActoryyYF : $@convention(thin) () -> () {
// CHECK-LABEL: sil hidden [ossa] @$s4test0A11GlobalActoryyYF : $@convention(thin) @async () -> () {
// CHECK: [[F:%[0-9]+]] = function_ref @$s4test11GlobalActorV6sharedAA02MyC0Cvau : $@convention(thin) () -> Builtin.RawPointer
// CHECK: [[P:%[0-9]+]] = apply [[F]]() : $@convention(thin) () -> Builtin.RawPointer
// CHECK: [[A:%[0-9]+]] = pointer_to_address %2 : $Builtin.RawPointer to [strict] $*MyActor
Expand All @@ -75,7 +82,7 @@ struct GenericGlobalActorWithGetter<T> {
static var shared: MyActor { return MyActor() }
}

// CHECK-LABEL: sil hidden [ossa] @$s4test0A28GenericGlobalActorWithGetteryyYF : $@convention(thin) () -> () {
// CHECK-LABEL: sil hidden [ossa] @$s4test0A28GenericGlobalActorWithGetteryyYF : $@convention(thin) @async () -> () {
// CHECK: [[MT:%[0-9]+]] = metatype $@thin GenericGlobalActorWithGetter<Int>.Type
// CHECK: [[F:%[0-9]+]] = function_ref @$s4test28GenericGlobalActorWithGetterV6sharedAA02MyD0CvgZ : $@convention(method) <τ_0_0> (@thin GenericGlobalActorWithGetter<τ_0_0>.Type) -> @owned MyActor
// CHECK: [[A:%[0-9]+]] = apply [[F]]<Int>([[MT]]) : $@convention(method) <τ_0_0> (@thin GenericGlobalActorWithGetter<τ_0_0>.Type) -> @owned MyActor
Expand Down