From 69c8fd97b34ea96dcdb816d50ebdfd4ad0933be5 Mon Sep 17 00:00:00 2001 From: "Yaxun (Sam) Liu" Date: Wed, 9 Jul 2025 09:32:43 -0400 Subject: [PATCH] [LLDB] Fix build after TargetInfo::adjust signature change Update LLDB calls to TargetInfo::adjust() to use the new 3-parameter signature introduced in beea2a941470368a87b1816e455b1db366c1bbb9. Pass nullptr for AuxTarget since LLDB doesn't use auxiliary targets in these contexts. Fixes buildbot failure on lldb-x86_64-debian. --- .../Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp | 2 +- .../Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp index 7aa9cae5a5614..657efb6de4a08 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp @@ -831,7 +831,7 @@ ClangExpressionParser::ClangExpressionParser( // FIXME: We shouldn't need to do this, the target should be immutable once // created. This complexity should be lifted elsewhere. m_compiler->getTarget().adjust(m_compiler->getDiagnostics(), - m_compiler->getLangOpts()); + m_compiler->getLangOpts(), /*AuxTarget=*/nullptr); // 5. Set up the diagnostic buffer for reporting errors auto diag_mgr = new ClangDiagnosticManagerAdapter( diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp index 284e5bc6fb1e5..8de8c157cd025 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp @@ -757,7 +757,7 @@ ClangModulesDeclVendor::Create(Target &target) { if (!instance->hasTarget()) return nullptr; - instance->getTarget().adjust(*diagnostics_engine, instance->getLangOpts()); + instance->getTarget().adjust(*diagnostics_engine, instance->getLangOpts(), /*AuxTarget=*/nullptr); if (!action->BeginSourceFile(*instance, instance->getFrontendOpts().Inputs[0]))