Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-11 18:20:43 +09:00
Code Activity

LibJS: Remove redundant VM& parameter from array_merge_sort()

Browse source 
This is covered by GlobalObject& just fine.
This commit is contained in:
Linus Groh 2022-06-13 07:52:28 +01:00
parent 105c516a78
commit aa5d5bf1c8
Notes: sideshowbarker 2024-07-17 10:17:19 +09:00
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibJS/Runtime/ArrayPrototype.cpp
View file

@ -867,13 +867,15 @@ JS_DEFINE_NATIVE_FUNCTION(ArrayPrototype::reverse)
return this_object;
}
ThrowCompletionOr<void> array_merge_sort(VM& vm, GlobalObject& global_object, FunctionObject* compare_func, MarkedVector<Value>& arr_to_sort)
ThrowCompletionOr<void> array_merge_sort(GlobalObject& global_object, FunctionObject* compare_func, MarkedVector<Value>& arr_to_sort)
{
// FIXME: it would probably be better to switch to insertion sort for small arrays for
// better performance
if (arr_to_sort.size() <= 1)
return {};
auto& vm = global_object.vm();
MarkedVector<Value> left(vm.heap());
MarkedVector<Value> right(vm.heap());
@ -888,8 +890,8 @@ ThrowCompletionOr<void> array_merge_sort(VM& vm, GlobalObject& global_object, Fu
}
}
TRY(array_merge_sort(vm, global_object, compare_func, left));
TRY(array_merge_sort(vm, global_object, compare_func, right));
TRY(array_merge_sort(global_object, compare_func, left));
TRY(array_merge_sort(global_object, compare_func, right));
arr_to_sort.clear();
@ -990,7 +992,7 @@ JS_DEFINE_NATIVE_FUNCTION(ArrayPrototype::sort)
// to be stable. FIXME: when initially scanning through the array, maintain a flag
// for if an unstable sort would be indistinguishable from a stable sort (such as just
// just strings or numbers), and in that case use quick sort instead for better performance.
TRY(array_merge_sort(vm, global_object, callback.is_undefined() ? nullptr : &callback.as_function(), items));
TRY(array_merge_sort(global_object, callback.is_undefined() ? nullptr : &callback.as_function(), items));
for (size_t j = 0; j < items.size(); ++j)
TRY(object->set(j, items[j], Object::ShouldThrowExceptions::Yes));

2
Userland/Libraries/LibJS/Runtime/ArrayPrototype.h
View file

@ -58,6 +58,6 @@ private:
JS_DECLARE_NATIVE_FUNCTION(group_to_map);
};
ThrowCompletionOr<void> array_merge_sort(VM&, GlobalObject&, FunctionObject* compare_func, MarkedVector<Value>& arr_to_sort);
ThrowCompletionOr<void> array_merge_sort(GlobalObject&, FunctionObject* compare_func, MarkedVector<Value>& arr_to_sort);
}