Skip to content

[lldb][windows] fix a deadlock when a module fails to import #12701

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

Draft
charles-zablit wants to merge 1 commit into
base: stable/21.x
Choose a base branch
from
Draft

[lldb][windows] fix a deadlock when a module fails to import #12701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,9 +1800,6 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
retry = true;
return;
}
// There are no fallback contexts in REPL and playgrounds.
if (repl || playground)
return;
// The fatal error causes a new compiler to be instantiated on retry.
m_swift_ast_ctx.RaiseFatalError(MIE.message());
},
Expand Down
29 changes: 17 additions & 12 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4477,24 +4477,29 @@ SwiftASTContext::GetModule(const SourceModule &module, bool *cached) {
return *module_decl;
}

ThreadSafeASTContext ast = GetASTContext();
if (!ast) {
LOG_PRINTF(GetLog(LLDBLog::Types), "(\"%s\") invalid ASTContext",
module.path.front().GetCString());
swift::ASTContext *raw_ast = nullptr;
{
ThreadSafeASTContext ast = GetASTContext();
if (!ast) {
LOG_PRINTF(GetLog(LLDBLog::Types), "(\"%s\") invalid ASTContext",
module.path.front().GetCString());

return llvm::createStringError("invalid swift::ASTContext");
}
return llvm::createStringError("invalid swift::ASTContext");
}

if (HasFatalErrors()) {
return llvm::createStringError(
llvm::formatv("failed to get module \"{0}\" from AST context:\n"
"AST context is in a fatal error state",
module_name));
if (HasFatalErrors()) {
return llvm::createStringError(
llvm::formatv("failed to get module \"{0}\" from AST context:\n"
"AST context is in a fatal error state",
module_name));
}

raw_ast = *ast;
}

// Create a diagnostic consumer for the diagnostics produced by the import.
auto import_diags = getScopedDiagnosticConsumer();
swift::ModuleDecl *module_decl = ast->getModuleByName(module_name);
swift::ModuleDecl *module_decl = raw_ast->getModuleByName(module_name);

// Error handling.
if (import_diags->HasErrors()) {
Expand Down