[Lldb-commits] [lldb] Add a new SBExpressionOptions::SetLanguage() API (NFCI) (PR #89981)
Adrian Prantl via lldb-commits
lldb-commits at lists.llvm.org
Wed Apr 24 12:57:27 PDT 2024
https://github.com/adrian-prantl created https://github.com/llvm/llvm-project/pull/89981
that separates out language and version. To avoid reinventing the wheel and introducing subtle incompatibilities, this API uses the table of languages and versiond defined by the upcoming DWARF 6 standard (https://dwarfstd.org/languages-v6.html). While the DWARF 6 spec is not finialized, the list of languages is broadly considered stable.
The primary motivation for this is to allow the Swift language plugin to switch between language dialects between, e.g., Swift 5.9 and 6.0 with out introducing a ton of new language codes. On the main branch this change is considered NFC.
Depends on https://github.com/llvm/llvm-project/pull/89980
>From 7e63653359ee0cfe251091017a4265aaea3770e3 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl at apple.com>
Date: Wed, 24 Apr 2024 12:50:43 -0700
Subject: [PATCH] Add a new SBExpressionOptions::SetLanguage() API (NFCI)
that separates out language and version. To avoid reinventing the
wheel and introducing subtle incompatibilities, this API uses the
table of languages and versiond defined by the upcoming DWARF 6
standard (https://dwarfstd.org/languages-v6.html). While the DWARF 6
spec is not finialized, the list of languages is broadly considered
stable.
The primary motivation for this is to allow the Swift language plugin
to switch between language dialects between, e.g., Swift 5.9 and 6.0
with out introducing a ton of new language codes. On the main branch
this change is considered NFC.
---
lldb/include/lldb/API/SBExpressionOptions.h | 4 +++
lldb/include/lldb/Expression/Expression.h | 7 ++--
.../lldb/Expression/LLVMUserExpression.h | 2 +-
lldb/include/lldb/Expression/UserExpression.h | 33 ++++++++++--------
lldb/include/lldb/Symbol/TypeSystem.h | 10 +++---
lldb/include/lldb/Target/StackFrame.h | 11 +++---
lldb/include/lldb/Target/Target.h | 19 ++++++++---
lldb/include/lldb/lldb-private-types.h | 19 +++++++++++
lldb/source/API/SBExpressionOptions.cpp | 7 ++++
lldb/source/API/SBFrame.cpp | 30 +++++++++-------
lldb/source/Breakpoint/Watchpoint.cpp | 5 ++-
.../Commands/CommandObjectDWIMPrint.cpp | 2 +-
lldb/source/Commands/CommandObjectType.cpp | 2 +-
lldb/source/Expression/LLVMUserExpression.cpp | 2 +-
lldb/source/Expression/UserExpression.cpp | 14 ++++----
lldb/source/Expression/UtilityFunction.cpp | 4 +--
.../Clang/ClangExpressionParser.cpp | 12 +++----
.../Clang/ClangUserExpression.cpp | 19 ++++++-----
.../Clang/ClangUserExpression.h | 6 ++--
.../TypeSystem/Clang/TypeSystemClang.cpp | 2 +-
.../TypeSystem/Clang/TypeSystemClang.h | 12 +++----
lldb/source/Target/Language.cpp | 34 +++++++++++++++++++
lldb/source/Target/StackFrame.cpp | 23 ++++++-------
lldb/source/Target/Target.cpp | 21 ++++++------
24 files changed, 187 insertions(+), 113 deletions(-)
diff --git a/lldb/include/lldb/API/SBExpressionOptions.h b/lldb/include/lldb/API/SBExpressionOptions.h
index e0ddfda5ba37a2..0f2d298d7513fe 100644
--- a/lldb/include/lldb/API/SBExpressionOptions.h
+++ b/lldb/include/lldb/API/SBExpressionOptions.h
@@ -67,6 +67,10 @@ class LLDB_API SBExpressionOptions {
void SetTrapExceptions(bool trap_exceptions = true);
void SetLanguage(lldb::LanguageType language);
+ /// Set the language using a pair of language code and version as
+ /// defined by the DWARF 6 specification.
+ /// WARNING: These codes may change until DWARF 6 is finalized.
+ void SetLanguage(uint16_t dwarf_lname_code, uint32_t dwarf_lversion);
#ifndef SWIG
void SetCancelCallback(lldb::ExpressionCancelCallback callback, void *baton);
diff --git a/lldb/include/lldb/Expression/Expression.h b/lldb/include/lldb/Expression/Expression.h
index 3e61d78828bbbf..356fe4b82ae43a 100644
--- a/lldb/include/lldb/Expression/Expression.h
+++ b/lldb/include/lldb/Expression/Expression.h
@@ -47,11 +47,8 @@ class Expression {
/// expression. Text() should contain the definition of this function.
virtual const char *FunctionName() = 0;
- /// Return the language that should be used when parsing. To use the
- /// default, return eLanguageTypeUnknown.
- virtual lldb::LanguageType Language() const {
- return lldb::eLanguageTypeUnknown;
- }
+ /// Return the language that should be used when parsing.
+ virtual SourceLanguage Language() const { return {}; }
/// Return the Materializer that the parser should use when registering
/// external values.
diff --git a/lldb/include/lldb/Expression/LLVMUserExpression.h b/lldb/include/lldb/Expression/LLVMUserExpression.h
index 7d32d17dbf544c..40b463933c07e8 100644
--- a/lldb/include/lldb/Expression/LLVMUserExpression.h
+++ b/lldb/include/lldb/Expression/LLVMUserExpression.h
@@ -52,7 +52,7 @@ class LLVMUserExpression : public UserExpression {
};
LLVMUserExpression(ExecutionContextScope &exe_scope, llvm::StringRef expr,
- llvm::StringRef prefix, lldb::LanguageType language,
+ llvm::StringRef prefix, SourceLanguage language,
ResultType desired_type,
const EvaluateExpressionOptions &options);
~LLVMUserExpression() override;
diff --git a/lldb/include/lldb/Expression/UserExpression.h b/lldb/include/lldb/Expression/UserExpression.h
index b6cfeec7e89933..b04d00b72e8faa 100644
--- a/lldb/include/lldb/Expression/UserExpression.h
+++ b/lldb/include/lldb/Expression/UserExpression.h
@@ -56,7 +56,7 @@ class UserExpression : public Expression {
/// If not eResultTypeAny, the type to use for the expression
/// result.
UserExpression(ExecutionContextScope &exe_scope, llvm::StringRef expr,
- llvm::StringRef prefix, lldb::LanguageType language,
+ llvm::StringRef prefix, SourceLanguage language,
ResultType desired_type,
const EvaluateExpressionOptions &options);
@@ -202,7 +202,7 @@ class UserExpression : public Expression {
virtual bool IsParseCacheable() { return true; }
/// Return the language that should be used when parsing. To use the
/// default, return eLanguageTypeUnknown.
- lldb::LanguageType Language() const override { return m_language; }
+ SourceLanguage Language() const override { return m_language; }
/// Return the desired result type of the function, or eResultTypeAny if
/// indifferent.
@@ -315,19 +315,22 @@ class UserExpression : public Expression {
lldb::ProcessSP &process_sp,
lldb::StackFrameSP &frame_sp);
- Address m_address; ///< The address the process is stopped in.
- std::string m_expr_text; ///< The text of the expression, as typed by the user
- std::string m_expr_prefix; ///< The text of the translation-level definitions,
- ///as provided by the user
- std::string m_fixed_text; ///< The text of the expression with fix-its applied
- ///- this won't be set if the fixed text doesn't
- ///parse.
- lldb::LanguageType m_language; ///< The language to use when parsing
- ///(eLanguageTypeUnknown means use defaults)
- ResultType m_desired_type; ///< The type to coerce the expression's result to.
- ///If eResultTypeAny, inferred from the expression.
- EvaluateExpressionOptions
- m_options; ///< Additional options provided by the user.
+ /// The address the process is stopped in.
+ Address m_address;
+ /// The text of the expression, as typed by the user.
+ std::string m_expr_text;
+ /// The text of the translation-level definitions, as provided by the user.
+ std::string m_expr_prefix;
+ /// The text of the expression with fix-its applied this won't be set if the
+ /// fixed text doesn't parse.
+ std::string m_fixed_text;
+ /// The language to use when parsing (unknown means use defaults).
+ SourceLanguage m_language;
+ /// The type to coerce the expression's result to. If eResultTypeAny, inferred
+ /// from the expression.
+ ResultType m_desired_type;
+ /// Additional options provided by the user.
+ EvaluateExpressionOptions m_options;
};
} // namespace lldb_private
diff --git a/lldb/include/lldb/Symbol/TypeSystem.h b/lldb/include/lldb/Symbol/TypeSystem.h
index 3a927d313b823d..6221e6d2e5d834 100644
--- a/lldb/include/lldb/Symbol/TypeSystem.h
+++ b/lldb/include/lldb/Symbol/TypeSystem.h
@@ -474,12 +474,10 @@ class TypeSystem : public PluginInterface,
return IsPointerOrReferenceType(type, nullptr);
}
- virtual UserExpression *
- GetUserExpression(llvm::StringRef expr, llvm::StringRef prefix,
- lldb::LanguageType language,
- Expression::ResultType desired_type,
- const EvaluateExpressionOptions &options,
- ValueObject *ctx_obj) {
+ virtual UserExpression *GetUserExpression(
+ llvm::StringRef expr, llvm::StringRef prefix, SourceLanguage language,
+ Expression::ResultType desired_type,
+ const EvaluateExpressionOptions &options, ValueObject *ctx_obj) {
return nullptr;
}
diff --git a/lldb/include/lldb/Target/StackFrame.h b/lldb/include/lldb/Target/StackFrame.h
index 6c18511c6e1ac3..259f8f9da0d1c7 100644
--- a/lldb/include/lldb/Target/StackFrame.h
+++ b/lldb/include/lldb/Target/StackFrame.h
@@ -446,13 +446,12 @@ class StackFrame : public ExecutionContextScope,
/// Query this frame to determine what the default language should be when
/// parsing expressions given the execution context.
///
- /// \return
- /// The language of the frame if known, else lldb::eLanguageTypeUnknown.
- lldb::LanguageType GetLanguage();
+ /// \return The language of the frame if known.
+ SourceLanguage GetLanguage();
- // similar to GetLanguage(), but is allowed to take a potentially incorrect
- // guess if exact information is not available
- lldb::LanguageType GuessLanguage();
+ /// Similar to GetLanguage(), but is allowed to take a potentially incorrect
+ /// guess if exact information is not available
+ SourceLanguage GuessLanguage();
/// Attempt to econstruct the ValueObject for a given raw address touched by
/// the current instruction. The ExpressionPath should indicate how to get
diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index 2c2e6b2831ccee..e7b1f5ca78592e 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -200,7 +200,7 @@ class TargetProperties : public Properties {
bool GetBreakpointsConsultPlatformAvoidList();
- lldb::LanguageType GetLanguage() const;
+ SourceLanguage GetLanguage() const;
llvm::StringRef GetExpressionPrefixContents();
@@ -310,9 +310,18 @@ class EvaluateExpressionOptions {
m_execution_policy = policy;
}
- lldb::LanguageType GetLanguage() const { return m_language; }
+ SourceLanguage GetLanguage() const { return m_language; }
- void SetLanguage(lldb::LanguageType language) { m_language = language; }
+ void SetLanguage(lldb::LanguageType language_type) {
+ m_language = SourceLanguage(language_type);
+ }
+
+ /// Set the language using a pair of language code and version as
+ /// defined by the DWARF 6 specification.
+ /// WARNING: These codes may change until DWARF 6 is finalized.
+ void SetLanguage(uint16_t dwarf_lname_code, uint32_t dwarf_lversion) {
+ m_language = SourceLanguage(dwarf_lname_code, dwarf_lversion);
+ }
bool DoesCoerceToId() const { return m_coerce_to_id; }
@@ -445,7 +454,7 @@ class EvaluateExpressionOptions {
private:
ExecutionPolicy m_execution_policy = default_execution_policy;
- lldb::LanguageType m_language = lldb::eLanguageTypeUnknown;
+ SourceLanguage m_language;
std::string m_prefix;
bool m_coerce_to_id = false;
bool m_unwind_on_error = true;
@@ -1160,7 +1169,7 @@ class Target : public std::enable_shared_from_this<Target>,
UserExpression *
GetUserExpressionForLanguage(llvm::StringRef expr, llvm::StringRef prefix,
- lldb::LanguageType language,
+ SourceLanguage language,
Expression::ResultType desired_type,
const EvaluateExpressionOptions &options,
ValueObject *ctx_obj, Status &error);
diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h
index 7d301666df1a17..b8779fce28f5a4 100644
--- a/lldb/include/lldb/lldb-private-types.h
+++ b/lldb/include/lldb/lldb-private-types.h
@@ -96,6 +96,25 @@ struct RegisterSet {
const uint32_t *registers;
};
+/// A type-erased pair of llvm::dwarf::SourceLanguageName and version.
+struct SourceLanguage {
+ SourceLanguage() = default;
+ SourceLanguage(lldb::LanguageType language_type);
+ SourceLanguage(uint32_t name, uint16_t version)
+ : name(name), version(version) {}
+ SourceLanguage(std::optional<std::pair<uint32_t, uint16_t>> name_vers)
+ : name(name_vers ? name_vers->first : 0),
+ version(name_vers ? name_vers->second : 0) {}
+ operator bool() const { return name > 0; }
+ lldb::LanguageType AsLanguageType() const;
+ llvm::StringRef GetDescription() const;
+ bool IsC() const;
+ bool IsObjC() const;
+ bool IsCPlusPlus() const;
+ uint16_t name = 0;
+ uint32_t version = 0;
+};
+
struct OptionEnumValueElement {
int64_t value;
const char *string_value;
diff --git a/lldb/source/API/SBExpressionOptions.cpp b/lldb/source/API/SBExpressionOptions.cpp
index bd81a04596b10d..3aea121f7323d4 100644
--- a/lldb/source/API/SBExpressionOptions.cpp
+++ b/lldb/source/API/SBExpressionOptions.cpp
@@ -156,6 +156,13 @@ void SBExpressionOptions::SetLanguage(lldb::LanguageType language) {
m_opaque_up->SetLanguage(language);
}
+void SBExpressionOptions::SetLanguage(uint16_t dwarf_lname_code,
+ uint32_t dwarf_lversion) {
+ LLDB_INSTRUMENT_VA(this, dwarf_lname_code, dwarf_lversion);
+
+ m_opaque_up->SetLanguage(dwarf_lname_code, dwarf_lversion);
+}
+
void SBExpressionOptions::SetCancelCallback(
lldb::ExpressionCancelCallback callback, void *baton) {
LLDB_INSTRUMENT_VA(this, callback, baton);
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index a16bbc2ae7562d..2de1f803aefe4a 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -1024,10 +1024,10 @@ SBValue SBFrame::EvaluateExpression(const char *expr) {
options.SetFetchDynamicValue(fetch_dynamic_value);
options.SetUnwindOnError(true);
options.SetIgnoreBreakpoints(true);
- if (target->GetLanguage() != eLanguageTypeUnknown)
- options.SetLanguage(target->GetLanguage());
- else
- options.SetLanguage(frame->GetLanguage());
+ SourceLanguage lang = target->GetLanguage();
+ if (!lang)
+ lang = frame->GetLanguage();
+ options.SetLanguage(lang.name, lang.version);
return EvaluateExpression(expr, options);
} else {
Status error;
@@ -1053,10 +1053,12 @@ SBFrame::EvaluateExpression(const char *expr,
StackFrame *frame = exe_ctx.GetFramePtr();
Target *target = exe_ctx.GetTargetPtr();
- if (target && target->GetLanguage() != eLanguageTypeUnknown)
- options.SetLanguage(target->GetLanguage());
- else if (frame)
- options.SetLanguage(frame->GetLanguage());
+ SourceLanguage language;
+ if (target)
+ language = target->GetLanguage();
+ if (!language && frame)
+ language = frame->GetLanguage();
+ options.SetLanguage(language.name, language.version);
return EvaluateExpression(expr, options);
}
@@ -1074,10 +1076,12 @@ SBValue SBFrame::EvaluateExpression(const char *expr,
options.SetIgnoreBreakpoints(true);
StackFrame *frame = exe_ctx.GetFramePtr();
Target *target = exe_ctx.GetTargetPtr();
- if (target && target->GetLanguage() != eLanguageTypeUnknown)
- options.SetLanguage(target->GetLanguage());
- else if (frame)
- options.SetLanguage(frame->GetLanguage());
+ SourceLanguage language;
+ if (target)
+ language = target->GetLanguage();
+ if (!language && frame)
+ language = frame->GetLanguage();
+ options.SetLanguage(language.name, language.version);
return EvaluateExpression(expr, options);
}
@@ -1218,7 +1222,7 @@ lldb::LanguageType SBFrame::GuessLanguage() const {
if (stop_locker.TryLock(&process->GetRunLock())) {
frame = exe_ctx.GetFramePtr();
if (frame) {
- return frame->GuessLanguage();
+ return frame->GuessLanguage().AsLanguageType();
}
}
}
diff --git a/lldb/source/Breakpoint/Watchpoint.cpp b/lldb/source/Breakpoint/Watchpoint.cpp
index a128ced5750449..edb1a0e93460c4 100644
--- a/lldb/source/Breakpoint/Watchpoint.cpp
+++ b/lldb/source/Breakpoint/Watchpoint.cpp
@@ -460,9 +460,8 @@ void Watchpoint::SetCondition(const char *condition) {
// Pass nullptr for expr_prefix (no translation-unit level definitions).
Status error;
m_condition_up.reset(m_target.GetUserExpressionForLanguage(
- condition, llvm::StringRef(), lldb::eLanguageTypeUnknown,
- UserExpression::eResultTypeAny, EvaluateExpressionOptions(), nullptr,
- error));
+ condition, {}, {}, UserExpression::eResultTypeAny,
+ EvaluateExpressionOptions(), nullptr, error));
if (error.Fail()) {
// FIXME: Log something...
m_condition_up.reset();
diff --git a/lldb/source/Commands/CommandObjectDWIMPrint.cpp b/lldb/source/Commands/CommandObjectDWIMPrint.cpp
index e1255f37d9bc58..f0b37e6832eab0 100644
--- a/lldb/source/Commands/CommandObjectDWIMPrint.cpp
+++ b/lldb/source/Commands/CommandObjectDWIMPrint.cpp
@@ -96,7 +96,7 @@ void CommandObjectDWIMPrint::DoExecute(StringRef command,
// Either Swift was explicitly specified, or the frame is Swift.
lldb::LanguageType language = m_expr_options.language;
if (language == lldb::eLanguageTypeUnknown && frame)
- language = frame->GuessLanguage();
+ language = frame->GuessLanguage().AsLanguageType();
// Add a hint if object description was requested, but no description
// function was implemented.
diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp
index 97489bdc2d9c28..46537dd1b98aaf 100644
--- a/lldb/source/Commands/CommandObjectType.cpp
+++ b/lldb/source/Commands/CommandObjectType.cpp
@@ -2509,7 +2509,7 @@ class CommandObjectTypeLookup : public CommandObjectRaw {
if (!frame)
return lang_type;
- lang_type = frame->GuessLanguage();
+ lang_type = frame->GuessLanguage().AsLanguageType();
if (lang_type != lldb::eLanguageTypeUnknown)
return lang_type;
diff --git a/lldb/source/Expression/LLVMUserExpression.cpp b/lldb/source/Expression/LLVMUserExpression.cpp
index 9c31cc84bf8f8b..1434011c80ad81 100644
--- a/lldb/source/Expression/LLVMUserExpression.cpp
+++ b/lldb/source/Expression/LLVMUserExpression.cpp
@@ -42,7 +42,7 @@ char LLVMUserExpression::ID;
LLVMUserExpression::LLVMUserExpression(ExecutionContextScope &exe_scope,
llvm::StringRef expr,
llvm::StringRef prefix,
- lldb::LanguageType language,
+ SourceLanguage language,
ResultType desired_type,
const EvaluateExpressionOptions &options)
: UserExpression(exe_scope, expr, prefix, language, desired_type, options),
diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp
index c181712a2f0b24..84578c7f9ad272 100644
--- a/lldb/source/Expression/UserExpression.cpp
+++ b/lldb/source/Expression/UserExpression.cpp
@@ -39,6 +39,7 @@
#include "lldb/Utility/Log.h"
#include "lldb/Utility/State.h"
#include "lldb/Utility/StreamString.h"
+#include "llvm/BinaryFormat/Dwarf.h"
using namespace lldb_private;
@@ -46,8 +47,7 @@ char UserExpression::ID;
UserExpression::UserExpression(ExecutionContextScope &exe_scope,
llvm::StringRef expr, llvm::StringRef prefix,
- lldb::LanguageType language,
- ResultType desired_type,
+ SourceLanguage language, ResultType desired_type,
const EvaluateExpressionOptions &options)
: Expression(exe_scope), m_expr_text(std::string(expr)),
m_expr_prefix(std::string(prefix)), m_language(language),
@@ -176,7 +176,7 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
}
lldb_private::ExecutionPolicy execution_policy = options.GetExecutionPolicy();
- lldb::LanguageType language = options.GetLanguage();
+ SourceLanguage language = options.GetLanguage();
const ResultType desired_type = options.DoesCoerceToId()
? UserExpression::eResultTypeId
: UserExpression::eResultTypeAny;
@@ -242,7 +242,7 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
// If the language was not specified in the expression command, set it to the
// language in the target's properties if specified, else default to the
// langage for the frame.
- if (language == lldb::eLanguageTypeUnknown) {
+ if (!language.name) {
if (target->GetLanguage() != lldb::eLanguageTypeUnknown)
language = target->GetLanguage();
else if (StackFrame *frame = exe_ctx.GetFramePtr())
@@ -384,7 +384,8 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
} else {
if (expr_result) {
result_valobj_sp = expr_result->GetValueObject();
- result_valobj_sp->SetPreferredDisplayLanguage(language);
+ result_valobj_sp->SetPreferredDisplayLanguage(
+ language.AsLanguageType());
LLDB_LOG(log,
"== [UserExpression::Evaluate] Execution completed "
@@ -426,7 +427,8 @@ UserExpression::Execute(DiagnosticManager &diagnostic_manager,
Target *target = exe_ctx.GetTargetPtr();
if (options.GetSuppressPersistentResult() && result_var && target) {
if (auto *persistent_state =
- target->GetPersistentExpressionStateForLanguage(m_language))
+ target->GetPersistentExpressionStateForLanguage(
+ m_language.AsLanguageType()))
persistent_state->RemovePersistentVariable(result_var);
}
return expr_result;
diff --git a/lldb/source/Expression/UtilityFunction.cpp b/lldb/source/Expression/UtilityFunction.cpp
index d7a3c9d41d0484..7b34c2c2ff76d5 100644
--- a/lldb/source/Expression/UtilityFunction.cpp
+++ b/lldb/source/Expression/UtilityFunction.cpp
@@ -80,8 +80,8 @@ FunctionCaller *UtilityFunction::MakeFunctionCaller(
name.append("-caller");
m_caller_up.reset(process_sp->GetTarget().GetFunctionCallerForLanguage(
- Language(), return_type, impl_code_address, arg_value_list, name.c_str(),
- error));
+ Language().AsLanguageType(), return_type, impl_code_address,
+ arg_value_list, name.c_str(), error));
if (error.Fail()) {
return nullptr;
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
index f48bdc730d9160..72c7cda13ecb70 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -392,8 +392,8 @@ ClangExpressionParser::ClangExpressionParser(
// Make sure clang uses the same VFS as LLDB.
m_compiler->createFileManager(FileSystem::Instance().GetVirtualFileSystem());
- lldb::LanguageType frame_lang =
- expr.Language(); // defaults to lldb::eLanguageTypeUnknown
+ // Defaults to lldb::eLanguageTypeUnknown.
+ lldb::LanguageType frame_lang = expr.Language().AsLanguageType();
std::string abi;
ArchSpec target_arch;
@@ -410,7 +410,7 @@ ClangExpressionParser::ClangExpressionParser(
// 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();
+ frame_lang = frame_sp->GetLanguage().AsLanguageType();
if (process_sp && frame_lang != lldb::eLanguageTypeUnknown) {
LLDB_LOGF(log, "Frame has language of type %s",
@@ -479,7 +479,7 @@ ClangExpressionParser::ClangExpressionParser(
assert(m_compiler->hasTarget());
// 4. Set language options.
- lldb::LanguageType language = expr.Language();
+ lldb::LanguageType language = expr.Language().AsLanguageType();
LangOptions &lang_opts = m_compiler->getLangOpts();
switch (language) {
@@ -1344,10 +1344,10 @@ lldb_private::Status ClangExpressionParser::PrepareForExecution(
{
auto lang = m_expr.Language();
LLDB_LOGF(log, "%s - Current expression language is %s\n", __FUNCTION__,
- Language::GetNameForLanguageType(lang));
+ lang.GetDescription().data());
lldb::ProcessSP process_sp = exe_ctx.GetProcessSP();
if (process_sp && lang != lldb::eLanguageTypeUnknown) {
- auto runtime = process_sp->GetLanguageRuntime(lang);
+ auto runtime = process_sp->GetLanguageRuntime(lang.AsLanguageType());
if (runtime)
runtime->GetIRPasses(custom_passes);
}
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
index 5776b1e94e0721..5ea7bc02a6e489 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
@@ -56,6 +56,7 @@
#include "clang/AST/DeclObjC.h"
#include "llvm/ADT/ScopeExit.h"
+#include "llvm/BinaryFormat/Dwarf.h"
using namespace lldb_private;
@@ -63,22 +64,21 @@ char ClangUserExpression::ID;
ClangUserExpression::ClangUserExpression(
ExecutionContextScope &exe_scope, llvm::StringRef expr,
- llvm::StringRef prefix, lldb::LanguageType language,
- ResultType desired_type, const EvaluateExpressionOptions &options,
- ValueObject *ctx_obj)
+ llvm::StringRef prefix, SourceLanguage language, ResultType desired_type,
+ const EvaluateExpressionOptions &options, ValueObject *ctx_obj)
: LLVMUserExpression(exe_scope, expr, prefix, language, desired_type,
options),
m_type_system_helper(*m_target_wp.lock(), options.GetExecutionPolicy() ==
eExecutionPolicyTopLevel),
m_result_delegate(exe_scope.CalculateTarget()), m_ctx_obj(ctx_obj) {
- switch (m_language) {
- case lldb::eLanguageTypeC_plus_plus:
+ switch (m_language.name) {
+ case llvm::dwarf::DW_LNAME_C_plus_plus:
m_allow_cxx = true;
break;
- case lldb::eLanguageTypeObjC:
+ case llvm::dwarf::DW_LNAME_ObjC:
m_allow_objc = true;
break;
- case lldb::eLanguageTypeObjC_plus_plus:
+ case llvm::dwarf::DW_LNAME_ObjC_plus_plus:
default:
m_allow_cxx = true;
m_allow_objc = true;
@@ -624,7 +624,8 @@ bool ClangUserExpression::TryParse(
void ClangUserExpression::SetupCppModuleImports(ExecutionContext &exe_ctx) {
Log *log = GetLog(LLDBLog::Expressions);
- CppModuleConfiguration module_config = GetModuleConfig(m_language, exe_ctx);
+ CppModuleConfiguration module_config =
+ GetModuleConfig(m_language.AsLanguageType(), exe_ctx);
m_imported_cpp_modules = module_config.GetImportedModules();
m_include_directories = module_config.GetIncludeDirs();
@@ -734,7 +735,7 @@ bool ClangUserExpression::Parse(DiagnosticManager &diagnostic_manager,
if (register_execution_unit) {
if (auto *persistent_state =
exe_ctx.GetTargetPtr()->GetPersistentExpressionStateForLanguage(
- m_language))
+ m_language.AsLanguageType()))
persistent_state->RegisterExecutionUnit(m_execution_unit_sp);
}
}
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.h b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
index bc07cbcf9e646d..09604feea5dec4 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.h
@@ -106,8 +106,8 @@ class ClangUserExpression : public LLVMUserExpression {
/// definitions to be included when the expression is parsed.
///
/// \param[in] language
- /// If not eLanguageTypeUnknown, a language to use when parsing
- /// the expression. Currently restricted to those languages
+ /// If not unknown, a language to use when parsing the
+ /// expression. Currently restricted to those languages
/// supported by Clang.
///
/// \param[in] desired_type
@@ -122,7 +122,7 @@ class ClangUserExpression : public LLVMUserExpression {
/// must be evaluated. For details see the comment to
/// `UserExpression::Evaluate`.
ClangUserExpression(ExecutionContextScope &exe_scope, llvm::StringRef expr,
- llvm::StringRef prefix, lldb::LanguageType language,
+ llvm::StringRef prefix, SourceLanguage language,
ResultType desired_type,
const EvaluateExpressionOptions &options,
ValueObject *ctx_obj);
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index 2621f682011b41..f20673d3a54506 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -9531,7 +9531,7 @@ void ScratchTypeSystemClang::Dump(llvm::raw_ostream &output) {
}
UserExpression *ScratchTypeSystemClang::GetUserExpression(
- llvm::StringRef expr, llvm::StringRef prefix, lldb::LanguageType language,
+ llvm::StringRef expr, llvm::StringRef prefix, SourceLanguage language,
Expression::ResultType desired_type,
const EvaluateExpressionOptions &options, ValueObject *ctx_obj) {
TargetSP target_sp = m_target_wp.lock();
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
index 68b82e9688f12b..91966b30e9d6fd 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
@@ -1272,12 +1272,12 @@ class ScratchTypeSystemClang : public TypeSystemClang {
/// \see lldb_private::TypeSystem::Dump
void Dump(llvm::raw_ostream &output) override;
- UserExpression *
- GetUserExpression(llvm::StringRef expr, llvm::StringRef prefix,
- lldb::LanguageType language,
- Expression::ResultType desired_type,
- const EvaluateExpressionOptions &options,
- ValueObject *ctx_obj) override;
+ UserExpression *GetUserExpression(llvm::StringRef expr,
+ llvm::StringRef prefix,
+ SourceLanguage language,
+ Expression::ResultType desired_type,
+ const EvaluateExpressionOptions &options,
+ ValueObject *ctx_obj) override;
FunctionCaller *GetFunctionCaller(const CompilerType &return_type,
const Address &function_address,
diff --git a/lldb/source/Target/Language.cpp b/lldb/source/Target/Language.cpp
index 1542c8cb68ce65..3d7bae0b8282bc 100644
--- a/lldb/source/Target/Language.cpp
+++ b/lldb/source/Target/Language.cpp
@@ -20,6 +20,7 @@
#include "lldb/Utility/Stream.h"
#include "llvm/Support/Threading.h"
+#include "llvm/BinaryFormat/Dwarf.h"
using namespace lldb;
using namespace lldb_private;
@@ -532,3 +533,36 @@ Language::Language() = default;
// Destructor
Language::~Language() = default;
+
+SourceLanguage::SourceLanguage(lldb::LanguageType language_type) {
+ auto lname =
+ llvm::dwarf::toDW_LNAME((llvm::dwarf::SourceLanguage)language_type);
+ if (!lname)
+ return;
+ name = lname->first;
+ version = lname->second;
+}
+
+lldb::LanguageType SourceLanguage::AsLanguageType() const {
+ if (auto lang = llvm::dwarf::toDW_LANG((llvm::dwarf::SourceLanguageName)name,
+ version))
+ return (lldb::LanguageType)*lang;
+ return lldb::eLanguageTypeUnknown;
+}
+
+llvm::StringRef SourceLanguage::GetDescription() const {
+ LanguageType type = AsLanguageType();
+ if (type)
+ return Language::GetNameForLanguageType(type);
+ return llvm::dwarf::LanguageDescription(
+ (llvm::dwarf::SourceLanguageName)name);
+}
+bool SourceLanguage::IsC() const { return name == llvm::dwarf::DW_LNAME_C; }
+
+bool SourceLanguage::IsObjC() const {
+ return name == llvm::dwarf::DW_LNAME_ObjC;
+}
+
+bool SourceLanguage::IsCPlusPlus() const {
+ return name == llvm::dwarf::DW_LNAME_C_plus_plus;
+}
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp
index 03a74f29e76e99..246871d5abaa52 100644
--- a/lldb/source/Target/StackFrame.cpp
+++ b/lldb/source/Target/StackFrame.cpp
@@ -1203,26 +1203,23 @@ bool StackFrame::IsArtificial() const {
return m_stack_frame_kind == StackFrame::Kind::Artificial;
}
-lldb::LanguageType StackFrame::GetLanguage() {
+SourceLanguage StackFrame::GetLanguage() {
CompileUnit *cu = GetSymbolContext(eSymbolContextCompUnit).comp_unit;
if (cu)
return cu->GetLanguage();
- return lldb::eLanguageTypeUnknown;
+ return {};
}
-lldb::LanguageType StackFrame::GuessLanguage() {
- LanguageType lang_type = GetLanguage();
+SourceLanguage StackFrame::GuessLanguage() {
+ SourceLanguage lang_type = GetLanguage();
if (lang_type == eLanguageTypeUnknown) {
- SymbolContext sc = GetSymbolContext(eSymbolContextFunction
- | eSymbolContextSymbol);
- if (sc.function) {
- lang_type = sc.function->GetMangled().GuessLanguage();
- }
+ SymbolContext sc =
+ GetSymbolContext(eSymbolContextFunction | eSymbolContextSymbol);
+ if (sc.function)
+ lang_type = LanguageType(sc.function->GetMangled().GuessLanguage());
else if (sc.symbol)
- {
- lang_type = sc.symbol->GetMangled().GuessLanguage();
- }
+ lang_type = SourceLanguage(sc.symbol->GetMangled().GuessLanguage());
}
return lang_type;
@@ -1302,7 +1299,7 @@ GetBaseExplainingDereference(const Instruction::Operand &operand,
}
return std::make_pair(nullptr, 0);
}
-}
+} // namespace
lldb::ValueObjectSP StackFrame::GuessValueForAddress(lldb::addr_t addr) {
TargetSP target_sp = CalculateTarget();
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 09b0ac42631d1a..892521b5d33099 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -504,7 +504,7 @@ BreakpointSP Target::CreateBreakpoint(
if (skip_prologue == eLazyBoolCalculate)
skip_prologue = GetSkipPrologue() ? eLazyBoolYes : eLazyBoolNo;
if (language == lldb::eLanguageTypeUnknown)
- language = GetLanguage();
+ language = GetLanguage().AsLanguageType();
BreakpointResolverSP resolver_sp(new BreakpointResolverName(
nullptr, func_name, func_name_type_mask, language, Breakpoint::Exact,
@@ -530,7 +530,7 @@ Target::CreateBreakpoint(const FileSpecList *containingModules,
if (skip_prologue == eLazyBoolCalculate)
skip_prologue = GetSkipPrologue() ? eLazyBoolYes : eLazyBoolNo;
if (language == lldb::eLanguageTypeUnknown)
- language = GetLanguage();
+ language = GetLanguage().AsLanguageType();
BreakpointResolverSP resolver_sp(
new BreakpointResolverName(nullptr, func_names, func_name_type_mask,
@@ -559,7 +559,7 @@ Target::CreateBreakpoint(const FileSpecList *containingModules,
skip_prologue = eLazyBoolNo;
}
if (language == lldb::eLanguageTypeUnknown)
- language = GetLanguage();
+ language = GetLanguage().AsLanguageType();
BreakpointResolverSP resolver_sp(new BreakpointResolverName(
nullptr, func_names, num_names, func_name_type_mask, language, offset,
@@ -2504,15 +2504,16 @@ Target::GetPersistentExpressionStateForLanguage(lldb::LanguageType language) {
}
UserExpression *Target::GetUserExpressionForLanguage(
- llvm::StringRef expr, llvm::StringRef prefix, lldb::LanguageType language,
+ llvm::StringRef expr, llvm::StringRef prefix, SourceLanguage language,
Expression::ResultType desired_type,
const EvaluateExpressionOptions &options, ValueObject *ctx_obj,
Status &error) {
- auto type_system_or_err = GetScratchTypeSystemForLanguage(language);
+ auto type_system_or_err =
+ GetScratchTypeSystemForLanguage(language.AsLanguageType());
if (auto err = type_system_or_err.takeError()) {
error.SetErrorStringWithFormat(
"Could not find type system for language %s: %s",
- Language::GetNameForLanguageType(language),
+ Language::GetNameForLanguageType(language.AsLanguageType()),
llvm::toString(std::move(err)).c_str());
return nullptr;
}
@@ -2521,7 +2522,7 @@ UserExpression *Target::GetUserExpressionForLanguage(
if (!ts) {
error.SetErrorStringWithFormat(
"Type system for language %s is no longer live",
- Language::GetNameForLanguageType(language));
+ language.GetDescription().data());
return nullptr;
}
@@ -2530,7 +2531,7 @@ UserExpression *Target::GetUserExpressionForLanguage(
if (!user_expr)
error.SetErrorStringWithFormat(
"Could not create an expression for language %s",
- Language::GetNameForLanguageType(language));
+ language.GetDescription().data());
return user_expr;
}
@@ -4646,9 +4647,9 @@ void TargetProperties::SetStandardErrorPath(llvm::StringRef path) {
SetPropertyAtIndex(idx, path);
}
-LanguageType TargetProperties::GetLanguage() const {
+SourceLanguage TargetProperties::GetLanguage() const {
const uint32_t idx = ePropertyLanguage;
- return GetPropertyAtIndexAs<LanguageType>(idx, {});
+ return {GetPropertyAtIndexAs<LanguageType>(idx, {})};
}
llvm::StringRef TargetProperties::GetExpressionPrefixContents() {
More information about the lldb-commits
mailing list