Skip to content

Concurrency: Implement resume(returning:) and resume(throwing:) for Unsafe*Continuation. #34902

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

Jump to bottom
Merged
merged 1 commit into from
Dec 8, 2020
Merged

Concurrency: Implement resume(returning:) and resume(throwing:) for Unsafe*Continuation. #34902

merged 1 commit into from
Dec 8, 2020

Conversation

jckarter
Copy link
Contributor

@jckarter jckarter commented Dec 1, 2020

No description provided.

@jckarter
Copy link
Contributor Author

jckarter commented Dec 1, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Dec 1, 2020

Build failed
Swift Test Linux Platform
Git Sha - 5d1398e413cd22ead0f12fbae72064fa3377b500

aschwaighofer
aschwaighofer reviewed Dec 1, 2020
View reviewed changes
@jckarter jckarter force-pushed the continuation-resume-operations branch from 5d1398e to 6393773 Compare December 1, 2020 18:54
@jckarter
Copy link
Contributor Author

jckarter commented Dec 1, 2020

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Dec 1, 2020

Build failed
Swift Test Linux Platform
Git Sha - 639377316188bd48509db48ce776f1b534f6eebb

@jckarter jckarter force-pushed the continuation-resume-operations branch from 6393773 to 37e6bb1 Compare December 5, 2020 00:44
@jckarter
Copy link
Contributor Author

jckarter commented Dec 5, 2020

@swift-ci Please test

@swift-ci
Copy link
Contributor

swift-ci commented Dec 5, 2020

Build failed
Swift Test OS X Platform
Git Sha - 37e6bb1bcfd9238ebfb3d9b4ba98684738cf9a77

@swift-ci
Copy link
Contributor

swift-ci commented Dec 5, 2020

Build failed
Swift Test Linux Platform
Git Sha - 37e6bb1bcfd9238ebfb3d9b4ba98684738cf9a77

@jckarter jckarter force-pushed the continuation-resume-operations branch from 37e6bb1 to 185f44e Compare December 7, 2020 15:48
@jckarter
Copy link
Contributor Author

jckarter commented Dec 7, 2020

@swift-ci Please test

@DougGregor
Copy link
Member

@swift-ci please test Linux

@DougGregor
Copy link
Member

@swift-ci please test macOS

@DougGregor DougGregor merged commit cc2e32f into swiftlang:main Dec 8, 2020
@compnerd
Copy link
Member

compnerd commented Dec 9, 2020

The dispatch/dispatch.h inclusion seems to break the build on certain targets :-(. Up until now, the standard library hasn't depended on dispatch, only the compiler. We could do another build of dispatch for Linux and Windows where dispatch is not part of the system if necessary.

compnerd added a commit to compnerd/apple-swift that referenced this pull request Dec 9, 2020
@compnerd
Concurrency: repair the build after swiftlang#34902
a1d8819 
libdispatch is not part of the system on Linux and Windows, and dispatch
has not been used for the standard library up until this point.  The
current usage is limited to the Apple platforms, so rather than adding
another build of dispatch, conditionally include the header instead.
compnerd added a commit that referenced this pull request Dec 9, 2020
@compnerd
Merge pull request #35022 from compnerd/34902
b43c671 
Concurrency: repair the build after #34902
ainu-bot added a commit to google/swift that referenced this pull request Dec 9, 2020
@ainu-bot
Merge branch 'main' of github.com:apple/swift into tensorflow-stage
d1a1ce0 
* 'main' of github.com:apple/swift:
  Concurrency: repair the build after swiftlang#34902
@rjmccall
Copy link
Contributor

The dispatch/dispatch.h inclusion seems to break the build on certain targets :-(. Up until now, the standard library hasn't depended on dispatch, only the compiler. We could do another build of dispatch for Linux and Windows where dispatch is not part of the system if necessary.

I think we're going to have to do that so that at least the C portions of Dispatch can be a dependency of _Concurrency, at least when we're not configured to use some alternate implementation.

@jckarter
Copy link
Contributor Author

Sorry, I had meant to #if __APPLE__ that part out, since the implementation here was just a fakeout for testing purposes. Now that @rjmccall has landed his task runtime implementation, I can remove the dispatch dependency here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aschwaighofer aschwaighofer aschwaighofer left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jckarter @swift-ci @DougGregor @compnerd @rjmccall @aschwaighofer