From 4b6eb0e63c698094db5506763df44cc83c19f643 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 20 Mar 2022 12:40:34 +0100 Subject: Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14-init-10186-gff7f2cfa959b. PR: 261742 MFC after: 2 weeks (cherry picked from commit 349cc55c9796c4596a5b9904cd3281af295f878f) --- .../ScriptInterpreter/Lua/ScriptInterpreterLua.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'contrib/llvm-project/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp') diff --git a/contrib/llvm-project/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp b/contrib/llvm-project/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp index ef46401c8b46..c677abfaa5f2 100644 --- a/contrib/llvm-project/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp @@ -148,6 +148,12 @@ ScriptInterpreterLua::ScriptInterpreterLua(Debugger &debugger) ScriptInterpreterLua::~ScriptInterpreterLua() = default; +StructuredData::DictionarySP ScriptInterpreterLua::GetInterpreterInfo() { + auto info = std::make_shared(); + info->AddStringItem("language", "lua"); + return info; +} + bool ScriptInterpreterLua::ExecuteOneLine(llvm::StringRef command, CommandReturnObject *result, const ExecuteScriptOptions &options) { @@ -387,19 +393,8 @@ ScriptInterpreterLua::CreateInstance(Debugger &debugger) { return std::make_shared(debugger); } -lldb_private::ConstString ScriptInterpreterLua::GetPluginNameStatic() { - static ConstString g_name("script-lua"); - return g_name; -} - -const char *ScriptInterpreterLua::GetPluginDescriptionStatic() { +llvm::StringRef ScriptInterpreterLua::GetPluginDescriptionStatic() { return "Lua script interpreter"; } -lldb_private::ConstString ScriptInterpreterLua::GetPluginName() { - return GetPluginNameStatic(); -} - -uint32_t ScriptInterpreterLua::GetPluginVersion() { return 1; } - Lua &ScriptInterpreterLua::GetLua() { return *m_lua; } -- cgit v1.2.3