Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2232,9 +2232,12 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
if (!module_sp)
return;

Log *log = GetLog(LLDBLog::Symbols);

const FileSpec &file = m_file ? m_file : module_sp->GetFileSpec();
const char *file_name = file.GetFilename().AsCString("<Unknown>");
LLDB_SCOPED_TIMERF("ObjectFileMachO::ParseSymtab () module = %s", file_name);
LLDB_LOG(log, "Parsing symbol table for {0}", file_name);
Progress progress(llvm::formatv("Parsing symbol table for {0}", file_name));

llvm::MachO::symtab_command symtab_load_command = {0, 0, 0, 0, 0, 0};
Expand Down Expand Up @@ -2264,7 +2267,6 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
lldb::offset_t offset = MachHeaderSizeFromMagic(m_header.magic);
uint32_t i;
FileSpecList dylib_files;
Log *log = GetLog(LLDBLog::Symbols);
llvm::StringRef g_objc_v2_prefix_class("_OBJC_CLASS_$_");
llvm::StringRef g_objc_v2_prefix_metaclass("_OBJC_METACLASS_$_");
llvm::StringRef g_objc_v2_prefix_ivar("_OBJC_IVAR_$_");
Expand Down Expand Up @@ -2665,7 +2667,9 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) {
std::set<lldb::addr_t> resolver_addresses;
std::set<lldb::addr_t> symbol_file_addresses;

if (dyld_trie_data.GetByteSize() > 0) {
const size_t dyld_trie_data_size = dyld_trie_data.GetByteSize();
if (dyld_trie_data_size > 0) {
LLDB_LOG(log, "Parsing {0} bytes of dyld trie data", dyld_trie_data_size);
SectionSP text_segment_sp =
GetSectionList()->FindSectionByName(GetSegmentNameTEXT());
lldb::addr_t text_segment_file_addr = LLDB_INVALID_ADDRESS;
Expand Down