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

Merge pull request #58978 from ahoppen/pr/no-deadlock-cancellation-bigger-change

Browse Source 
[SoruceKit] Audit SwiftASTManager to prevent deadlocks
This commit is contained in:
Alex Hoppen
2023-06-26 13:11:08 +02:00
committed by GitHub
parent da34a4ef88 453f6cdeee
commit 22d34d9b14
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -1182,6 +1182,7 @@ void ASTBuildOperation::schedule(WorkQueue Queue) {
/*ExpectedOldState=*/State::Running);
};
SmallVector<SwiftASTConsumerRef, 4> ConsumersToCancel;
{
llvm::sys::ScopedLock L(ConsumersAndResultMtx);
if (Consumers.empty()) {
@@ -1192,24 +1193,25 @@ void ASTBuildOperation::schedule(WorkQueue Queue) {
if (CancellationFlag->load(std::memory_order_relaxed)) {
assert(false && "We should only set the cancellation flag if there "
"are no more consumers");
for (auto &Consumer : Consumers) {
Consumer->cancelled();
}
ConsumersToCancel = Consumers;
}
}
for (auto &Consumer : ConsumersToCancel) {
Consumer->cancelled();
}
std::string Error;
assert(!Result && "We should only be producing a result once");
ASTUnitRef AST = buildASTUnit(Error);
SmallVector<SwiftASTConsumerRef, 4> LocalConsumers;
SmallVector<SwiftASTConsumerRef, 4> ConsumersToInform;
{
llvm::sys::ScopedLock L(ConsumersAndResultMtx);
bool WasCancelled = CancellationFlag->load(std::memory_order_relaxed);
Result.emplace(AST, Error, WasCancelled);
LocalConsumers = Consumers;
ConsumersToInform = Consumers;
Consumers = {};
}
for (auto &Consumer : LocalConsumers) {
for (auto &Consumer : ConsumersToInform) {
informConsumer(Consumer);
}
DidFinishCallback();