Skip to content
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

[Concurrency] SR-15309: Fix instance task.isCancelled impl to use _task #39710

Merged
merged 1 commit into from Oct 13, 2021

Conversation

ktoso
Copy link
Member

@ktoso ktoso commented Oct 13, 2021

Instance (not static) version of isCancelled was using the current task, rather than the _task of the Task it was defined in...

Resolves SR-15309
Resolves rdar://84146091

@ktoso
Copy link
Member Author

ktoso commented Oct 13, 2021

@swift-ci please smoke test

@ktoso ktoso added the concurrency Feature: umbrella label for concurrency language features label Oct 13, 2021
@ktoso
Copy link
Member Author

ktoso commented Oct 13, 2021

Silly unrelated failure on mac 12:35:45 lldb-api :: lang/swift/deployment_target/TestSwiftDeploymentTarget.py

@ktoso
Copy link
Member Author

ktoso commented Oct 13, 2021

@swift-ci please smoke test macOS

Copy link
Member

@rjmccall rjmccall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as the basic bugfix. We'll need to make calls to this getter turn into calls to swift_task_isCancelled (i.e. _taskIsCancelled) in order to get existing code to work in back deployment. Fortunately, that function is already designed to be ABI.

@ktoso ktoso merged commit 737962e into apple:main Oct 13, 2021
@ktoso ktoso deleted the wip-fix-task-instance-isCancelled branch October 13, 2021 07:17
DougGregor pushed a commit to DougGregor/swift that referenced this pull request Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
concurrency Feature: umbrella label for concurrency language features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants