[LLDB] Fix build after TargetInfo::adjust signature change #147727
Merged
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update LLDB calls to TargetInfo::adjust() to use the new 3-parameter signature introduced in beea2a9. Pass nullptr for AuxTarget since LLDB doesn't use auxiliary targets in these contexts. Fixes buildbot failure on lldb-x86_64-debian.
|
@llvm/pr-subscribers-lldb Author: Yaxun (Sam) Liu (yxsamliu) ChangesFixes buildbot failure on lldb-x86_64-debian due to #146620 https://lab.llvm.org/buildbot/#/builders/162/builds/26414 Update LLDB calls to TargetInfo::adjust() to use the new 3-parameter signature introduced in beea2a9. Pass nullptr for AuxTarget since LLDB doesn't use auxiliary targets in these contexts. Full diff: https://github.com/llvm/llvm-project/pull/147727.diff 2 Files Affected:
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]))
|
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions cpp -- lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cppView the diff from clang-format here.diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
index 657efb6de..3995bc002 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -831,7 +831,8 @@ 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(), /*AuxTarget=*/nullptr);
+ 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 8de8c157c..2f838b3f0 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -757,7 +757,8 @@ ClangModulesDeclVendor::Create(Target &target) {
if (!instance->hasTarget())
return nullptr;
- instance->getTarget().adjust(*diagnostics_engine, instance->getLangOpts(), /*AuxTarget=*/nullptr);
+ instance->getTarget().adjust(*diagnostics_engine, instance->getLangOpts(),
+ /*AuxTarget=*/nullptr);
if (!action->BeginSourceFile(*instance,
instance->getFrontendOpts().Inputs[0]))
|
Michael137
added a commit
that referenced
this pull request
Jul 9, 2025
… and ClangModulesDeclVendor.cpp This wasn't addressed as part of #147727
yxsamliu
added a commit
to yxsamliu/llvm-project
that referenced
this pull request
Jul 9, 2025
…lvm#147727)" This reverts commit 92fbfc2.
yxsamliu
added a commit
to yxsamliu/llvm-project
that referenced
this pull request
Jul 9, 2025
introduced by llvm#147727
yxsamliu
added a commit
to yxsamliu/llvm-project
that referenced
this pull request
Jul 9, 2025
introduced by llvm#147727
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Jul 9, 2025
…nParser.cpp and ClangModulesDeclVendor.cpp This wasn't addressed as part of llvm/llvm-project#147727
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes buildbot failure on lldb-x86_64-debian due to #146620
https://lab.llvm.org/buildbot/#/builders/162/builds/26414
Update LLDB calls to TargetInfo::adjust() to use the new 3-parameter signature introduced in beea2a9. Pass nullptr for AuxTarget since LLDB doesn't use auxiliary targets in these contexts.