Skip to content

Commit 04b8348

Browse files
[lldb][Swift] Update LLDB swift API after reverting CASOptions changes
Update LLDB's usage of Swift compiler APIs.
1 parent 644ff43 commit 04b8348

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,10 @@ static void ConfigureCASStorage(SwiftASTContext *m_ast_context,
929929
}
930930
m_ast_context->SetCASStorage(std::move(maybe_cas->first),
931931
std::move(maybe_cas->second));
932-
m_ast_context->GetCASOptions().Config = *cas_config;
932+
m_ast_context->GetCASOptions().CASOpts.CASPath = cas_config->CASPath;
933+
m_ast_context->GetCASOptions().CASOpts.PluginPath = cas_config->PluginPath;
934+
m_ast_context->GetCASOptions().CASOpts.PluginOptions =
935+
cas_config->PluginOptions;
933936
LOG_PRINTF(GetLog(LLDBLog::Types),
934937
"Setup CAS from module list properties with cas path: %s",
935938
cas_config->CASPath.c_str());
@@ -1962,10 +1965,10 @@ void SwiftASTContext::AddExtraClangCC1Args(
19621965
bool use_cas_module = m_cas && m_action_cache;
19631966
if (use_cas_module) {
19641967
// Load from CAS.
1965-
invocation.getCASOpts().CASPath = GetCASOptions().Config.CASPath;
1966-
invocation.getCASOpts().PluginPath = GetCASOptions().Config.PluginPath;
1968+
invocation.getCASOpts().CASPath = GetCASOptions().CASOpts.CASPath;
1969+
invocation.getCASOpts().PluginPath = GetCASOptions().CASOpts.PluginPath;
19671970
invocation.getCASOpts().PluginOptions =
1968-
GetCASOptions().Config.PluginOptions;
1971+
GetCASOptions().CASOpts.PluginOptions;
19691972

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

0 commit comments

Comments
 (0)