averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Builtin.hopToActor

Browse Source 
SILGen this builtin to a mandatory hop_to_executor with an actor type
operand.

e.g.

    Task.detached {
      Builtin.hopToActor(MainActor.shared)
      await suspend()
    }

Required to fix a bug in _runAsyncMain.
This commit is contained in:
Andrew Trick
2021-06-13 21:31:36 -07:00
parent 7d11dc5004
commit c4f1f56ea7
20 changed files with 174 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/SILOptimizer/Mandatory/OptimizeHopToExecutor.cpp
View File

@@ -233,17 +233,22 @@ bool OptimizeHopToExecutor::removeRedundantHopToExecutors(const Actors &actors)
actorIdx = BlockState::Unknown;
continue;
}
if (auto *hop = dyn_cast<HopToExecutorInst>(inst)) {
int newActorIdx = actors.lookup(hop->getOperand());
if (newActorIdx == actorIdx) {
// There is a dominating hop_to_executor with the same operand.
hop->eraseFromParent();
changed = true;
continue;
}
auto *hop = dyn_cast<HopToExecutorInst>(inst);
if (!hop)
continue;
int newActorIdx = actors.lookup(hop->getOperand());
if (newActorIdx != actorIdx) {
actorIdx = newActorIdx;
continue;
}
if (hop->isMandatory())
continue;
// There is a dominating hop_to_executor with the same operand.
LLVM_DEBUG(llvm::dbgs() << "Redundant executor " << *hop);
hop->eraseFromParent();
changed = true;
}
assert(actorIdx == state.exit);
}
@@ -279,8 +284,10 @@ bool OptimizeHopToExecutor::removeDeadHopToExecutors() {
for (auto iter = state.block->rbegin(); iter != state.block->rend();) {
SILInstruction *inst = &*iter++;
auto *hop = dyn_cast<HopToExecutorInst>(inst);
if (hop && needActor == BlockState::NoExecutorNeeded) {
if (hop && !hop->isMandatory()
&& needActor == BlockState::NoExecutorNeeded) {
// Remove the dead hop_to_executor.
LLVM_DEBUG(llvm::dbgs() << "Dead executor " << *hop);
hop->eraseFromParent();
changed = true;
continue;