From 145449b1e420787bb99721a429341fa6be3adfb6 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 3 Jul 2022 16:10:23 +0200 Subject: Vendor import of llvm-project main llvmorg-15-init-15358-g53dc0f107877. --- lldb/source/Core/ModuleList.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lldb/source/Core/ModuleList.cpp') diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp index 48412137546d..1692a3710a3d 100644 --- a/lldb/source/Core/ModuleList.cpp +++ b/lldb/source/Core/ModuleList.cpp @@ -22,8 +22,8 @@ #include "lldb/Symbol/VariableList.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/ConstString.h" +#include "lldb/Utility/LLDBLog.h" #include "lldb/Utility/Log.h" -#include "lldb/Utility/Logging.h" #include "lldb/Utility/UUID.h" #include "lldb/lldb-defines.h" @@ -180,10 +180,15 @@ PathMappingList ModuleListProperties::GetSymlinkMappings() const { return m_symlink_paths; } +bool ModuleListProperties::GetLoadSymbolOnDemand() { + const uint32_t idx = ePropertyLoadSymbolOnDemand; + return m_collection_sp->GetPropertyAtIndexAsBoolean( + nullptr, idx, g_modulelist_properties[idx].default_uint_value != 0); +} + ModuleList::ModuleList() : m_modules(), m_modules_mutex() {} -ModuleList::ModuleList(const ModuleList &rhs) - : m_modules(), m_modules_mutex(), m_notifier(nullptr) { +ModuleList::ModuleList(const ModuleList &rhs) : m_modules(), m_modules_mutex() { std::lock_guard lhs_guard(m_modules_mutex); std::lock_guard rhs_guard(rhs.m_modules_mutex); m_modules = rhs.m_modules; @@ -807,7 +812,7 @@ ModuleList::GetSharedModule(const ModuleSpec &module_spec, ModuleSP &module_sp, if (old_modules) old_modules->push_back(module_sp); - Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_MODULES)); + Log *log = GetLog(LLDBLog::Modules); if (log != nullptr) LLDB_LOGF( log, "%p '%s' module changed: removing from global module list", -- cgit v1.3