LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibELF: Get rid of DynamicLoader::m_cached_dynamic_object

Browse Source 
The strategy of recreating an object for the second time after
DynamicLoader::map is interesting, of course, but it doesn't help
comprehensibility of the code, unfortunately.
This commit is contained in:
Dan Klishch 2024-04-21 12:05:46 -04:00 committed by Andrew Kaster
parent c9a6bcf81d
commit cf92efc497
Notes: sideshowbarker 2024-07-16 22:16:50 +09:00 
Author: https://github.com/DanShaders
Commit: https://github.com/SerenityOS/serenity/commit/cf92efc497
Pull-request: https://github.com/SerenityOS/serenity/pull/24059
Reviewed-by: https://github.com/ADKaster ✅
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Userland/Libraries/LibELF/DynamicLoader.cpp
View File

@ -98,23 +98,6 @@ DynamicLoader::~DynamicLoader()
}
}
DynamicObject const& DynamicLoader::dynamic_object() const
{
if (!m_cached_dynamic_object) {
VirtualAddress dynamic_section_address;
image().for_each_program_header([&dynamic_section_address](auto program_header) {
if (program_header.type() == PT_DYNAMIC) {
dynamic_section_address = VirtualAddress(program_header.raw_data());
}
});
VERIFY(!dynamic_section_address.is_null());
m_cached_dynamic_object = ELF::DynamicObject::create(m_filepath, VirtualAddress(image().base_address()), dynamic_section_address);
}
return *m_cached_dynamic_object;
}
void DynamicLoader::find_tls_size_and_alignment()
{
image().for_each_program_header([this](auto program_header) {

4
Userland/Libraries/LibELF/DynamicLoader.h
View File

@ -88,7 +88,7 @@ public:
static Optional<DynamicObject::SymbolLookupResult> lookup_symbol(const ELF::DynamicObject::Symbol&);
void copy_initial_tls_data_into(Bytes buffer) const;
DynamicObject const& dynamic_object() const;
DynamicObject const& dynamic_object() const { return *m_dynamic_object; }
bool is_fully_relocated() const { return m_fully_relocated; }
bool is_fully_initialized() const { return m_fully_initialized; }
@ -178,8 +178,6 @@ private:
Vector<DynamicObject::Relocation> m_direct_ifunc_relocations;
Vector<DynamicObject::Relocation> m_plt_ifunc_relocations;
mutable RefPtr<DynamicObject> m_cached_dynamic_object;
bool m_fully_relocated { false };
bool m_fully_initialized { false };
};