diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2019-12-21 17:11:12 -0800 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2019-12-21 17:11:12 -0800 |
| commit | bbf70c046789f4403a9c02fc5558708ef19073cf (patch) | |
| tree | 9d48a1cc734bc8dd51b2c5447d21362ab84fe1f3 /lldb/source/Core | |
| parent | 4164be7206d740b77b5a7b4b2f859ed122d08c10 (diff) | |
| download | bcm5719-llvm-bbf70c046789f4403a9c02fc5558708ef19073cf.tar.gz bcm5719-llvm-bbf70c046789f4403a9c02fc5558708ef19073cf.zip | |
[lldb/Core] Support asking the debugger for a specific script interpreter
Rather than holding on to one script interpreter, it should be possible
to request a script interpreter for a specific scripting language. The
GetScriptInterpreter method now takes an optional scripting language
argument.
(NFC)
Diffstat (limited to 'lldb/source/Core')
| -rw-r--r-- | lldb/source/Core/Debugger.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index 18397d00dca..c4619776c11 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -708,8 +708,8 @@ Debugger::Debugger(lldb::LogOutputCallback log_callback, void *baton) m_source_manager_up(), m_source_file_cache(), m_command_interpreter_up( std::make_unique<CommandInterpreter>(*this, false)), - m_script_interpreter_sp(), m_input_reader_stack(), m_instance_name(), - m_loaded_plugins(), m_event_handler_thread(), m_io_handler_thread(), + m_input_reader_stack(), m_instance_name(), m_loaded_plugins(), + m_event_handler_thread(), m_io_handler_thread(), m_sync_broadcaster(nullptr, "lldb.debugger.sync"), m_forward_listener_sp(), m_clear_once() { char instance_cstr[256]; @@ -1198,17 +1198,21 @@ bool Debugger::EnableLog(llvm::StringRef channel, error_stream); } -ScriptInterpreter *Debugger::GetScriptInterpreter(bool can_create) { +ScriptInterpreter * +Debugger::GetScriptInterpreter(bool can_create, + llvm::Optional<lldb::ScriptLanguage> language) { std::lock_guard<std::recursive_mutex> locker(m_script_interpreter_mutex); + lldb::ScriptLanguage script_language = + language ? *language : GetScriptLanguage(); - if (!m_script_interpreter_sp) { + if (!m_script_interpreters[script_language]) { if (!can_create) return nullptr; - m_script_interpreter_sp = PluginManager::GetScriptInterpreterForLanguage( - GetScriptLanguage(), *this); + m_script_interpreters[script_language] = + PluginManager::GetScriptInterpreterForLanguage(script_language, *this); } - return m_script_interpreter_sp.get(); + return m_script_interpreters[script_language].get(); } SourceManager &Debugger::GetSourceManager() { |

