Skip to content

[lldb] Unlock Swift scratch context before early return #3865

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
Feb 2, 2022
Merged

[lldb] Unlock Swift scratch context before early return #3865

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32fa093
[lldb] Unlock Swift scratch context before early return
kastiglione Feb 1, 2022
2911abe
use make_scope_exit
kastiglione Feb 1, 2022
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
4 changes: 3 additions & 1 deletion lldb/source/Target/Target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,6 +2286,9 @@ Target::GetScratchTypeSystemForLanguage(lldb::LanguageType language,
// thread) is holding a read lock to the scratch context and
// replacing it could cause a use-after-free later on.
if (GetSwiftScratchContextLock().try_lock()) {
auto unlock = llvm::make_scope_exit([this] {
GetSwiftScratchContextLock().unlock();
});
if (m_use_scratch_typesystem_per_module)
DisplayFallbackSwiftContextErrors(swift_ast_ctx);
else if (StreamSP errs = GetDebugger().GetAsyncErrorStream()) {
Expand Down Expand Up @@ -2335,7 +2338,6 @@ Target::GetScratchTypeSystemForLanguage(lldb::LanguageType language,
llvm::make_error<llvm::StringError>("DIAF", llvm::inconvertibleErrorCode());
}
}
GetSwiftScratchContextLock().unlock();
}
}
} else if (create_on_demand) {
Expand Down