Resolve conflicts with the main branch
#2965
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- stop storing the parent task in the TaskGroup at the .swift level - make sure that swift_taskGroup_isCancelled is implied by the parent task being cancelled - make the TaskGroup structs frozen - make the withTaskGroup functions inlinable - remove swift_taskGroup_create - teach IRGen to allocate memory for the task group - don't deallocate the task group in swift_taskGroup_destroy To achieve the allocation change, introduce paired create/destroy builtins. Furthermore, remove the _swiftRetain and _swiftRelease functions and several calls to them. Replace them with uses of the appropriate builtins. I should probably change the builtins to return retained, since they're working with a managed type, but I'll do that in a separate commit.
rdar://76162972
rdar://76461340
…rt for borrows. This is code that was written at the very beginning of Swift and has some early style remaining interspirsed with newer swift style code. Since I am going to be touching this and I don't expect other people to touch it for a while, I am fixing up the formatting/reorganizing rather than leaving the style inconsistent.
…loc promotion, and a generalized MemoryToRegisters. This code organization already existed in the file in content, but all of the routines were mixed together. This splits the code by topic providing to the eye easy code locality when reading.
`TaskGroup::offer(completedTask)`:
* Called from `AsyncTask::completeFuture()` which already takes care of
`release(completedTask)`. No additional edge is required if no task
is waiting and completed task is stored so it can be retrieved by
`group.poll()`.
* If group has waiting task, it will be dequeued and scheduled, add
`acquire(waitingTask)`.
`TaskGroupImpl::poll(waitingTask)`:
* If no pending tasks, do nothing.
* If returning finished task, `acquire(finishedTask)`.
* If enqueuing waiting task, `release(waitingTask)`.
Note: `release()` should go before, and `acquire()` after the annotated
synchronization operation.
Radar-Id: rdar://75910632
…ze-aware-cache [AST] make ASTContext RawComment cache aware of serialization
…a5e9bb721447e75f17e4d26 [mem2reg] Before adding support for promoting allocations with load_borrow, modernize/standardize style
Clean up the TaskGroup ABI
…oncurrency-import Revert "Enable import of the _Concurrency module by default."
…-target-cpu Use %target-cpu in the tests to support running on Apple Silicon hard…
…ationHandler_arm64e_windows Fix with cancellation handler arm64e windows
# Conflicts: # stdlib/public/Concurrency/TaskGroup.swift
kateinoigakukun
approved these changes
Apr 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.