Skip to content

Commit d65fbdc

Browse files
committed
Kernel: Use TRY() in Thread
1 parent ae885b1 commit d65fbdc

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Kernel/Thread.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,10 +1028,7 @@ RegisterState& Thread::get_register_dump_from_stack()
10281028

10291029
KResultOr<NonnullRefPtr<Thread>> Thread::try_clone(Process& process)
10301030
{
1031-
auto thread_or_error = Thread::try_create(process);
1032-
if (thread_or_error.is_error())
1033-
return thread_or_error.error();
1034-
auto& clone = thread_or_error.value();
1031+
auto clone = TRY(Thread::try_create(process));
10351032
auto signal_action_data_span = m_signal_action_data.span();
10361033
signal_action_data_span.copy_to(clone->m_signal_action_data.span());
10371034
clone->m_signal_mask = m_signal_mask;
@@ -1196,14 +1193,12 @@ KResult Thread::make_thread_specific_region(Badge<Process>)
11961193
if (!range.has_value())
11971194
return ENOMEM;
11981195

1199-
auto region_or_error = process().address_space().allocate_region(range.value(), "Thread-specific", PROT_READ | PROT_WRITE);
1200-
if (region_or_error.is_error())
1201-
return region_or_error.error();
1196+
auto* region = TRY(process().address_space().allocate_region(range.value(), "Thread-specific", PROT_READ | PROT_WRITE));
12021197

12031198
m_thread_specific_range = range.value();
12041199

12051200
SmapDisabler disabler;
1206-
auto* thread_specific_data = (ThreadSpecificData*)region_or_error.value()->vaddr().offset(align_up_to(process().m_master_tls_size, thread_specific_region_alignment())).as_ptr();
1201+
auto* thread_specific_data = (ThreadSpecificData*)region->vaddr().offset(align_up_to(process().m_master_tls_size, thread_specific_region_alignment())).as_ptr();
12071202
auto* thread_local_storage = (u8*)((u8*)thread_specific_data) - align_up_to(process().m_master_tls_size, process().m_master_tls_alignment);
12081203
m_thread_specific_data = VirtualAddress(thread_specific_data);
12091204
thread_specific_data->self = thread_specific_data;

0 commit comments

Comments
 (0)