Author: Jason Molenda Date: 2024-11-26T17:00:35-08:00 New Revision: f2129ca94c47875b5f915abc9d7dfb02a7445fe6
URL: https://github.com/llvm/llvm-project/commit/f2129ca94c47875b5f915abc9d7dfb02a7445fe6 DIFF: https://github.com/llvm/llvm-project/commit/f2129ca94c47875b5f915abc9d7dfb02a7445fe6.diff LOG: [lldb][NFC] Whitespace fix for mis-indented block This mis-indented block makes a FC change I'm about to propose look larger than it is when clang-formatted. Added: Modified: lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 85edf4bd5494ae..079fd905037d45 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -2408,45 +2408,44 @@ void ObjectFileMachO::ParseSymtab(Symtab &symtab) { strtab_addr = linkedit_load_addr + symtab_load_command.stroff - linkedit_file_offset; - // Always load dyld - the dynamic linker - from memory if we didn't - // find a binary anywhere else. lldb will not register - // dylib/framework/bundle loads/unloads if we don't have the dyld - // symbols, we force dyld to load from memory despite the user's - // target.memory-module-load-level setting. - if (memory_module_load_level == eMemoryModuleLoadLevelComplete || - m_header.filetype == llvm::MachO::MH_DYLINKER) { - DataBufferSP nlist_data_sp( - ReadMemory(process_sp, symoff_addr, nlist_data_byte_size)); - if (nlist_data_sp) - nlist_data.SetData(nlist_data_sp, 0, nlist_data_sp->GetByteSize()); - if (dysymtab.nindirectsyms != 0) { - const addr_t indirect_syms_addr = linkedit_load_addr + - dysymtab.indirectsymoff - - linkedit_file_offset; - DataBufferSP indirect_syms_data_sp(ReadMemory( - process_sp, indirect_syms_addr, dysymtab.nindirectsyms * 4)); - if (indirect_syms_data_sp) - indirect_symbol_index_data.SetData( - indirect_syms_data_sp, 0, - indirect_syms_data_sp->GetByteSize()); - // If this binary is outside the shared cache, - // cache the string table. - // Binaries in the shared cache all share a giant string table, - // and we can't share the string tables across multiple - // ObjectFileMachO's, so we'd end up re-reading this mega-strtab - // for every binary in the shared cache - it would be a big perf - // problem. For binaries outside the shared cache, it's faster to - // read the entire strtab at once instead of piece-by-piece as we - // process the nlist records. - if (!is_shared_cache_image) { - DataBufferSP strtab_data_sp( - ReadMemory(process_sp, strtab_addr, strtab_data_byte_size)); - if (strtab_data_sp) { - strtab_data.SetData(strtab_data_sp, 0, - strtab_data_sp->GetByteSize()); - } + // Always load dyld - the dynamic linker - from memory if we didn't + // find a binary anywhere else. lldb will not register + // dylib/framework/bundle loads/unloads if we don't have the dyld + // symbols, we force dyld to load from memory despite the user's + // target.memory-module-load-level setting. + if (memory_module_load_level == eMemoryModuleLoadLevelComplete || + m_header.filetype == llvm::MachO::MH_DYLINKER) { + DataBufferSP nlist_data_sp( + ReadMemory(process_sp, symoff_addr, nlist_data_byte_size)); + if (nlist_data_sp) + nlist_data.SetData(nlist_data_sp, 0, nlist_data_sp->GetByteSize()); + if (dysymtab.nindirectsyms != 0) { + const addr_t indirect_syms_addr = linkedit_load_addr + + dysymtab.indirectsymoff - + linkedit_file_offset; + DataBufferSP indirect_syms_data_sp(ReadMemory( + process_sp, indirect_syms_addr, dysymtab.nindirectsyms * 4)); + if (indirect_syms_data_sp) + indirect_symbol_index_data.SetData( + indirect_syms_data_sp, 0, indirect_syms_data_sp->GetByteSize()); + // If this binary is outside the shared cache, + // cache the string table. + // Binaries in the shared cache all share a giant string table, + // and we can't share the string tables across multiple + // ObjectFileMachO's, so we'd end up re-reading this mega-strtab + // for every binary in the shared cache - it would be a big perf + // problem. For binaries outside the shared cache, it's faster to + // read the entire strtab at once instead of piece-by-piece as we + // process the nlist records. + if (!is_shared_cache_image) { + DataBufferSP strtab_data_sp( + ReadMemory(process_sp, strtab_addr, strtab_data_byte_size)); + if (strtab_data_sp) { + strtab_data.SetData(strtab_data_sp, 0, + strtab_data_sp->GetByteSize()); } } + } if (memory_module_load_level >= eMemoryModuleLoadLevelPartial) { if (function_starts_load_command.cmd) { const addr_t func_start_addr = _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
