Skip to content

[lldb][ExpressionParser][NFC] Clean up expression language picking logic #156642

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

Merged
merged 1 commit into from
Sep 3, 2025
Merged

[lldb][ExpressionParser][NFC] Clean up expression language picking logic #156642

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
22 changes: 9 additions & 13 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,23 +536,19 @@ static void SetupLangOpts(CompilerInstance &compiler,
lldb::StackFrameSP frame_sp = exe_scope.CalculateStackFrame();
lldb::ProcessSP process_sp = exe_scope.CalculateProcess();

// Defaults to lldb::eLanguageTypeUnknown.
lldb::LanguageType frame_lang = expr.Language().AsLanguageType();

// Make sure the user hasn't provided a preferred execution language with
// `expression --language X -- ...`
if (frame_sp && frame_lang == lldb::eLanguageTypeUnknown)
frame_lang = frame_sp->GetLanguage().AsLanguageType();
lldb::LanguageType language = expr.Language().AsLanguageType();

if (process_sp && frame_lang != lldb::eLanguageTypeUnknown) {
LLDB_LOGF(log, "Frame has language of type %s",
lldb_private::Language::GetNameForLanguageType(frame_lang));
}
if (process_sp)
LLDB_LOG(
log,
"Frame has language of type {0}\nPicked {1} for expression evaluation.",
lldb_private::Language::GetNameForLanguageType(
frame_sp ? frame_sp->GetLanguage().AsLanguageType()
: lldb::eLanguageTypeUnknown),
lldb_private::Language::GetNameForLanguageType(language));

lldb::LanguageType language = expr.Language().AsLanguageType();
LangOptions &lang_opts = compiler.getLangOpts();

// FIXME: should this switch on frame_lang?
switch (language) {
case lldb::eLanguageTypeC:
case lldb::eLanguageTypeC89:
Expand Down
Loading