RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:37:35 +00:00
Code Issues Activity Actions

LibDebug: Store LibDebug objects on the heap & make them non-copyable

Browse source 
This fixes an issue were some LibDebug objects (for example,
Dwarf::CompilationUnit) held a reference to their parent
Dwarf::DwarfInfo object, which was constructed on the stack and later
moved to the heap.
This commit is contained in:
Itamar 2021-06-18 14:31:03 +03:00 • committed by Andreas Kling
parent edd79ddd00
commit e9e4358a93
7 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibSymbolication/Symbolication.cpp
View file

@ -16,7 +16,7 @@ namespace Symbolication {
struct CachedELF {
NonnullRefPtr<MappedFile> mapped_file;
Debug::DebugInfo debug_info;
NonnullOwnPtr<Debug::DebugInfo> debug_info;
};
static HashMap<String, OwnPtr<CachedELF>> s_cache;
@ -36,8 +36,7 @@ Optional<Symbol> symbolicate(String const& path, u32 address)
s_cache.set(path, {});
{};
}
Debug::DebugInfo debug_info(move(elf));
auto cached_elf = make<CachedELF>(mapped_file.release_value(), move(debug_info));
auto cached_elf = make<CachedELF>(mapped_file.release_value(), make<Debug::DebugInfo>(move(elf)));
s_cache.set(path, move(cached_elf));
}
@ -49,8 +48,8 @@ Optional<Symbol> symbolicate(String const& path, u32 address)
return {};
u32 offset = 0;
auto symbol = cached_elf->debug_info.elf().symbolicate(address, &offset);
auto source_position = cached_elf->debug_info.get_source_position(address);
auto symbol = cached_elf->debug_info->elf().symbolicate(address, &offset);
auto source_position = cached_elf->debug_info->get_source_position(address);
String filename;
u32 line_number = 0;
if (source_position.has_value()) {