diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-12-09 13:28:42 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-12-09 13:28:42 +0000 |
| commit | b1c73532ee8997fe5dfbeb7d223027bdf99758a0 (patch) | |
| tree | 7d6e51c294ab6719475d660217aa0c0ad0526292 /lldb/source/Core/Module.cpp | |
| parent | 7fa27ce4a07f19b07799a767fc29416f3b625afb (diff) | |
Diffstat (limited to 'lldb/source/Core/Module.cpp')
| -rw-r--r-- | lldb/source/Core/Module.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index 672d86496bde..e6279a0feda8 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -23,11 +23,11 @@ #include "lldb/Interpreter/ScriptInterpreter.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" -#include "lldb/Symbol/LocateSymbolFile.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/Symbol.h" #include "lldb/Symbol/SymbolContext.h" #include "lldb/Symbol/SymbolFile.h" +#include "lldb/Symbol/SymbolLocator.h" #include "lldb/Symbol/SymbolVendor.h" #include "lldb/Symbol/Symtab.h" #include "lldb/Symbol/Type.h" @@ -233,12 +233,12 @@ Module::Module(const ModuleSpec &module_spec) } Module::Module(const FileSpec &file_spec, const ArchSpec &arch, - const ConstString *object_name, lldb::offset_t object_offset, + ConstString object_name, lldb::offset_t object_offset, const llvm::sys::TimePoint<> &object_mod_time) : m_mod_time(FileSystem::Instance().GetModificationTime(file_spec)), - m_arch(arch), m_file(file_spec), m_object_offset(object_offset), - m_object_mod_time(object_mod_time), m_file_has_changed(false), - m_first_file_changed_log(false) { + m_arch(arch), m_file(file_spec), m_object_name(object_name), + m_object_offset(object_offset), m_object_mod_time(object_mod_time), + m_file_has_changed(false), m_first_file_changed_log(false) { // Scope for locker below... { std::lock_guard<std::recursive_mutex> guard( @@ -246,9 +246,6 @@ Module::Module(const FileSpec &file_spec, const ArchSpec &arch, GetModuleCollection().push_back(this); } - if (object_name) - m_object_name = *object_name; - Log *log(GetLog(LLDBLog::Object | LLDBLog::Modules)); if (log != nullptr) LLDB_LOGF(log, "%p Module::Module((%s) '%s%s%s%s')", @@ -1285,7 +1282,8 @@ ObjectFile *Module::GetObjectFile() { // those values that overwrite unspecified unknown values. m_arch.MergeFrom(m_objfile_sp->GetArchitecture()); } else { - ReportError("failed to load objfile for {0}", + ReportError("failed to load objfile for {0}\nDebugging will be " + "degraded for this module.", GetFileSpec().GetPath().c_str()); } } @@ -1316,7 +1314,7 @@ UnwindTable &Module::GetUnwindTable() { if (!m_unwind_table) { m_unwind_table.emplace(*this); if (!m_symfile_spec) - Symbols::DownloadSymbolFileAsync(GetUUID()); + SymbolLocator::DownloadSymbolFileAsync(GetUUID()); } return *m_unwind_table; } |