Skip to content

Commit fe9bc18

Browse files
Merge pull request #5573 from adrian-prantl/debugger-support
Move the initialization of the DebuggerSupport flag to a single place.
2 parents e8fd438 + e95bfb7 commit fe9bc18

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,6 @@ SetupASTContext(SwiftASTContextForExpressions &swift_ast_context,
917917
// swift_ast_context.GetLanguageOptions().DebugConstraintSolver = true;
918918
swift_ast_context.ClearDiagnostics();
919919

920-
swift_ast_context.GetLanguageOptions().DebuggerSupport = true;
921920
// No longer part of debugger support, set it separately.
922921
swift_ast_context.GetLanguageOptions().EnableDollarIdentifiers = true;
923922
swift_ast_context.GetLanguageOptions().EnableAccessControl =

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,7 @@ SwiftASTContext::SwiftASTContext(std::string description,
927927
// to avoid crashing due to module recovery issues.
928928
swift::LangOptions &lang_opts = m_compiler_invocation_ap->getLangOptions();
929929
lang_opts.AllowDeserializingImplementationOnly = true;
930+
lang_opts.DebuggerSupport = true;
930931
}
931932

932933
SwiftASTContext::~SwiftASTContext() {
@@ -1488,7 +1489,6 @@ SwiftASTContext::CreateInstance(lldb::LanguageType language, Module &module,
14881489
// This is a module AST context, mark it as such.
14891490
swift_ast_sp->m_is_scratch_context = false;
14901491
swift_ast_sp->m_module = &module;
1491-
swift_ast_sp->GetLanguageOptions().DebuggerSupport = true;
14921492
swift_ast_sp->GetLanguageOptions().EnableAccessControl = false;
14931493
swift_ast_sp->GetLanguageOptions().EnableTargetOSChecking = false;
14941494

0 commit comments

Comments
 (0)