Author: xiaobai Date: Wed May 29 11:08:22 2019 New Revision: 361999 URL: http://llvm.org/viewvc/llvm-project?rev=361999&view=rev Log: [Target] Introduce Process::GetLanguageRuntimes
Summary: Currently there's not really a good way to iterate over the language runtimes a process has. This is sometimes desirable (as seen in my change to Thread). Additionally, there's not really a good reason to iterate over every available language, but rather only over languages for which we have a plugin loaded. Reviewers: JDevlieghere, davide, jingham Subscribers: lldb-commits Differential Revision: https://reviews.llvm.org/D62562 Modified: lldb/trunk/include/lldb/Target/Language.h lldb/trunk/include/lldb/Target/Process.h lldb/trunk/source/Target/Language.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/source/Target/Thread.cpp Modified: lldb/trunk/include/lldb/Target/Language.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Language.h?rev=361999&r1=361998&r2=361999&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Language.h (original) +++ lldb/trunk/include/lldb/Target/Language.h Wed May 29 11:08:22 2019 @@ -264,6 +264,8 @@ public: // etc. static lldb::LanguageType GetPrimaryLanguage(lldb::LanguageType language); + static std::set<lldb::LanguageType> GetSupportedLanguages(); + static void GetLanguagesSupportingTypeSystems( std::set<lldb::LanguageType> &languages, std::set<lldb::LanguageType> &languages_for_expressions); Modified: lldb/trunk/include/lldb/Target/Process.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Process.h?rev=361999&r1=361998&r2=361999&view=diff ============================================================================== --- lldb/trunk/include/lldb/Target/Process.h (original) +++ lldb/trunk/include/lldb/Target/Process.h Wed May 29 11:08:22 2019 @@ -2178,6 +2178,9 @@ public: OperatingSystem *GetOperatingSystem() { return m_os_up.get(); } + std::vector<LanguageRuntime *> + GetLanguageRuntimes(bool retry_if_null = true); + LanguageRuntime *GetLanguageRuntime(lldb::LanguageType language, bool retry_if_null = true); Modified: lldb/trunk/source/Target/Language.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Language.cpp?rev=361999&r1=361998&r2=361999&view=diff ============================================================================== --- lldb/trunk/source/Target/Language.cpp (original) +++ lldb/trunk/source/Target/Language.cpp Wed May 29 11:08:22 2019 @@ -348,6 +348,15 @@ LanguageType Language::GetPrimaryLanguag } } +std::set<lldb::LanguageType> Language::GetSupportedLanguages() { + std::set<lldb::LanguageType> supported_languages; + ForEach([&](Language *lang) { + supported_languages.emplace(lang->GetLanguageType()); + return true; + }); + return supported_languages; +} + void Language::GetLanguagesSupportingTypeSystems( std::set<lldb::LanguageType> &languages, std::set<lldb::LanguageType> &languages_for_expressions) { Modified: lldb/trunk/source/Target/Process.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=361999&r1=361998&r2=361999&view=diff ============================================================================== --- lldb/trunk/source/Target/Process.cpp (original) +++ lldb/trunk/source/Target/Process.cpp Wed May 29 11:08:22 2019 @@ -44,6 +44,7 @@ #include "lldb/Target/InstrumentationRuntime.h" #include "lldb/Target/JITLoader.h" #include "lldb/Target/JITLoaderList.h" +#include "lldb/Target/Language.h" #include "lldb/Target/LanguageRuntime.h" #include "lldb/Target/MemoryHistory.h" #include "lldb/Target/MemoryRegionInfo.h" @@ -1547,6 +1548,27 @@ const lldb::ABISP &Process::GetABI() { return m_abi_sp; } +std::vector<LanguageRuntime *> +Process::GetLanguageRuntimes(bool retry_if_null) { + std::vector<LanguageRuntime *> language_runtimes; + + if (m_finalizing) + return language_runtimes; + + std::lock_guard<std::recursive_mutex> guard(m_language_runtimes_mutex); + // Before we pass off a copy of the language runtimes, we must make sure that + // our collection is properly populated. It's possible that some of the + // language runtimes were not loaded yet, either because nobody requested it + // yet or the proper condition for loading wasn't yet met (e.g. libc++.so + // hadn't been loaded). + for (const lldb::LanguageType lang_type : Language::GetSupportedLanguages()) { + if (LanguageRuntime *runtime = GetLanguageRuntime(lang_type, retry_if_null)) + language_runtimes.emplace_back(runtime); + } + + return language_runtimes; +} + LanguageRuntime *Process::GetLanguageRuntime(lldb::LanguageType language, bool retry_if_null) { if (m_finalizing) Modified: lldb/trunk/source/Target/Thread.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Thread.cpp?rev=361999&r1=361998&r2=361999&view=diff ============================================================================== --- lldb/trunk/source/Target/Thread.cpp (original) +++ lldb/trunk/source/Target/Thread.cpp Wed May 29 11:08:22 2019 @@ -2211,11 +2211,9 @@ ValueObjectSP Thread::GetCurrentExceptio // NOTE: Even though this behavior is generalized, only ObjC is actually // supported at the moment. - for (unsigned lang = eLanguageTypeUnknown; lang < eNumLanguageTypes; lang++) { - if (auto runtime = GetProcess()->GetLanguageRuntime( - static_cast<lldb::LanguageType>(lang))) - if (auto e = runtime->GetExceptionObjectForThread(shared_from_this())) - return e; + for (LanguageRuntime *runtime : GetProcess()->GetLanguageRuntimes()) { + if (auto e = runtime->GetExceptionObjectForThread(shared_from_this())) + return e; } return ValueObjectSP(); @@ -2228,11 +2226,9 @@ ThreadSP Thread::GetCurrentExceptionBack // NOTE: Even though this behavior is generalized, only ObjC is actually // supported at the moment. - for (unsigned lang = eLanguageTypeUnknown; lang < eNumLanguageTypes; lang++) { - if (auto runtime = GetProcess()->GetLanguageRuntime( - static_cast<lldb::LanguageType>(lang))) - if (auto bt = runtime->GetBacktraceThreadFromException(exception)) - return bt; + for (LanguageRuntime *runtime : GetProcess()->GetLanguageRuntimes()) { + if (auto bt = runtime->GetBacktraceThreadFromException(exception)) + return bt; } return ThreadSP(); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
