Skip to content

[lldb][Swift] Update LLDB swift API after reverting CASOptions changes #11839

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

Open
wants to merge 1 commit into
base: stable/21.x
Choose a base branch
from
Open

[lldb][Swift] Update LLDB swift API after reverting CASOptions changes #11839

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
11 changes: 7 additions & 4 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 @@ -929,7 +929,10 @@ static void ConfigureCASStorage(SwiftASTContext *m_ast_context,
}
m_ast_context->SetCASStorage(std::move(maybe_cas->first),
std::move(maybe_cas->second));
m_ast_context->GetCASOptions().Config = *cas_config;
m_ast_context->GetCASOptions().CASOpts.CASPath = cas_config->CASPath;
m_ast_context->GetCASOptions().CASOpts.PluginPath = cas_config->PluginPath;
m_ast_context->GetCASOptions().CASOpts.PluginOptions =
cas_config->PluginOptions;
LOG_PRINTF(GetLog(LLDBLog::Types),
"Setup CAS from module list properties with cas path: %s",
cas_config->CASPath.c_str());
Expand Down Expand Up @@ -1962,10 +1965,10 @@ void SwiftASTContext::AddExtraClangCC1Args(
bool use_cas_module = m_cas && m_action_cache;
if (use_cas_module) {
// Load from CAS.
invocation.getCASOpts().CASPath = GetCASOptions().Config.CASPath;
invocation.getCASOpts().PluginPath = GetCASOptions().Config.PluginPath;
invocation.getCASOpts().CASPath = GetCASOptions().CASOpts.CASPath;
invocation.getCASOpts().PluginPath = GetCASOptions().CASOpts.PluginPath;
invocation.getCASOpts().PluginOptions =
GetCASOptions().Config.PluginOptions;
GetCASOptions().CASOpts.PluginOptions;

// Check the module availability in CAS, if not, fallback to regular load.
auto CheckModuleInCAS = [&](const std::string &key) {
Expand Down