RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 02:18:12 +00:00
Code Issues Activity Actions

LibELF: Use a bit of TRY in DynamicLinker

Browse source 
`TRY` also works for `Result<>`. Who knew?
This commit is contained in:
Tim Schumacher 2022-10-28 17:46:20 +02:00 • committed by Linus Groh
parent 31643c4ee3
commit e7d0fb50a1
1 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibELF/DynamicLinker.cpp
View file

@ -89,12 +89,7 @@ static String get_library_name(String path)
static Result<NonnullRefPtr<DynamicLoader>, DlErrorMessage> map_library(String const& filename, int fd, String const& filepath)
{
auto result = ELF::DynamicLoader::try_create(fd, filepath);
if (result.is_error()) {
return result;
}
auto& loader = result.value();
auto loader = TRY(ELF::DynamicLoader::try_create(fd, filepath));
s_loaders.set(get_library_name(filename), *loader);
@ -183,14 +178,8 @@ static Result<void, DlErrorMessage> map_dependencies(String const& name)
String library_name = get_library_name(needed_name);
if (!s_loaders.contains(library_name) && !s_global_objects.contains(library_name)) {
auto result1 = resolve_and_map_library(needed_name, parent_object);
if (result1.is_error()) {
return result1.error();
}
auto result2 = map_dependencies(library_name);
if (result2.is_error()) {
return result2.error();
}
auto result1 = TRY(resolve_and_map_library(needed_name, parent_object));
TRY(map_dependencies(library_name));
}
}
dbgln_if(DYNAMIC_LOAD_DEBUG, "mapped dependencies for {}", name);
@ -476,24 +465,16 @@ static Result<void*, DlErrorMessage> __dlopen(char const* filename, int flags)
auto const& parent_object = **s_global_objects.get(get_library_name(s_main_program_path));
auto result1 = resolve_and_map_library(filename, parent_object);
if (result1.is_error()) {
return result1.error();
}
auto result1 = TRY(resolve_and_map_library(filename, parent_object));
if (auto error = verify_tls_for_dlopen(result1.value()); error.has_value())
if (auto error = verify_tls_for_dlopen(result1); error.has_value())
return error.value();
auto result2 = map_dependencies(library_name);
if (result2.is_error()) {
return result2.error();
}
TRY(map_dependencies(library_name));
auto result = link_main_library(library_name, flags);
if (result.is_error())
return result.error();
TRY(link_main_library(library_name, flags));
s_total_tls_size += result1.value()->tls_size_of_current_object() + result1.value()->tls_alignment_of_current_object();
s_total_tls_size += result1->tls_size_of_current_object() + result1->tls_alignment_of_current_object();
auto object = s_global_objects.get(library_name);
if (!object.has_value())