Skip to content

[sourcekit] Fix a race between AST processing and reopening a document #18160

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

Merged
merged 2 commits into from
Sep 14, 2018
Merged

[sourcekit] Fix a race between AST processing and reopening a document #18160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2fadc3
[unittest] Fix some unintentional behaviour in EditingTest
benlangmuir Jul 23, 2018
a8d5493
[sourcekit] Fix a race between AST processing and reopening a document
benlangmuir Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,8 +1673,13 @@ ImmutableTextSnapshotRef SwiftEditorDocument::replaceText(
}

void SwiftEditorDocument::updateSemaInfo() {
if (Impl.SemanticInfo) {
Impl.SemanticInfo->processLatestSnapshotAsync(Impl.EditableBuffer);
Impl.AccessMtx.lock();
auto EditableBuffer = Impl.EditableBuffer;
auto SemanticInfo = Impl.SemanticInfo;
Impl.AccessMtx.unlock(); // Not a recursive mutex, so unlock before processing

if (SemanticInfo) {
SemanticInfo->processLatestSnapshotAsync(EditableBuffer);
}
}

Expand Down Expand Up @@ -1978,6 +1983,7 @@ void SwiftEditorDocument::expandPlaceholder(unsigned Offset, unsigned Length,
}

ImmutableTextSnapshotRef SwiftEditorDocument::getLatestSnapshot() const {
llvm::sys::ScopedLock L(Impl.AccessMtx);
return Impl.EditableBuffer->getSnapshot();
}

Expand Down
4 changes: 3 additions & 1 deletion unittests/SourceKit/SwiftLang/EditingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void EditTest::doubleOpenWithDelay(useconds_t delay, bool closeDoc) {
// be queried, since the semantic info from the first open is unreachable.
for (int i = 0; i < 2; ++i) {
bool expired = waitForDocUpdate(/*reset=*/true);
ASSERT_FALSE(expired) << "no second notification";
ASSERT_FALSE(expired) << "no " << (i ? "second " : "") << "notification";
replaceText(DocName, 0, 0, StringRef(), Consumer);
if (!Consumer.Diags.empty())
break;
Expand All @@ -262,6 +262,8 @@ void EditTest::doubleOpenWithDelay(useconds_t delay, bool closeDoc) {

ASSERT_EQ(1u, Consumer.Diags.size());
EXPECT_STREQ("use of unresolved identifier 'unknown_name'", Consumer.Diags[0].Description.c_str());

close(DocName);
}

// This test is failing occassionally in CI: rdar://42483323
Expand Down