Skip to content

Fix #8072: Synchronize cancelling timer task properly #8076

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.

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 1 commit into from
Jan 23, 2020
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,11 @@ trait ImportSuggestions with
typedImplicit(candidate, expectedType, argument, span)(
given ctx.fresh.setExploreTyperState()).isSuccess
finally
task.cancel()
ctx.run.isCancelled = false
if task.cancel() then // timer task has not run yet
assert(!ctx.run.isCancelled)
else
while !ctx.run.isCancelled do () // wait until timer task has run to completion
ctx.run.isCancelled = false
}
end deepTest

Expand Down