From 74e93a46eaf9be3c3835682ab2c190c75371ac86 Mon Sep 17 00:00:00 2001 From: Matthew Olsson Date: Sat, 25 Feb 2023 10:44:21 -0700 Subject: [PATCH] LibJS: Fix a few const-ness issues --- .../LibJS/Runtime/PromiseConstructor.cpp | 2 +- .../PromiseResolvingElementFunctions.cpp | 18 ++++++++--------- .../PromiseResolvingElementFunctions.h | 20 +++++++++---------- .../Libraries/LibJS/Runtime/SetPrototype.cpp | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/PromiseConstructor.cpp b/Userland/Libraries/LibJS/Runtime/PromiseConstructor.cpp index abde029b26..7036fa5266 100644 --- a/Userland/Libraries/LibJS/Runtime/PromiseConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/PromiseConstructor.cpp @@ -190,7 +190,7 @@ static ThrowCompletionOr perform_promise_all_settled(VM& vm, Iterator& it } // 27.2.4.3.1 PerformPromiseAny ( iteratorRecord, constructor, resultCapability, promiseResolve ), https://tc39.es/ecma262/#sec-performpromiseany -static ThrowCompletionOr perform_promise_any(VM& vm, Iterator& iterator_record, Value constructor, PromiseCapability const& result_capability, Value promise_resolve) +static ThrowCompletionOr perform_promise_any(VM& vm, Iterator& iterator_record, Value constructor, PromiseCapability& result_capability, Value promise_resolve) { auto& realm = *vm.current_realm(); diff --git a/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.cpp b/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.cpp index a937995209..ab576a08df 100644 --- a/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.cpp +++ b/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.cpp @@ -20,7 +20,7 @@ void PromiseValueList::visit_edges(Visitor& visitor) visitor.visit(val); } -PromiseResolvingElementFunction::PromiseResolvingElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) +PromiseResolvingElementFunction::PromiseResolvingElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) : NativeFunction(prototype) , m_index(index) , m_values(values) @@ -55,12 +55,12 @@ void PromiseResolvingElementFunction::visit_edges(Cell::Visitor& visitor) visitor.visit(&m_remaining_elements); } -NonnullGCPtr PromiseAllResolveElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) +NonnullGCPtr PromiseAllResolveElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) { return realm.heap().allocate(realm, index, values, capability, remaining_elements, *realm.intrinsics().function_prototype()).release_allocated_value_but_fixme_should_propagate_errors(); } -PromiseAllResolveElementFunction::PromiseAllResolveElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) +PromiseAllResolveElementFunction::PromiseAllResolveElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) : PromiseResolvingElementFunction(index, values, capability, remaining_elements, prototype) { } @@ -87,12 +87,12 @@ ThrowCompletionOr PromiseAllResolveElementFunction::resolve_element() return js_undefined(); } -NonnullGCPtr PromiseAllSettledResolveElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) +NonnullGCPtr PromiseAllSettledResolveElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) { return realm.heap().allocate(realm, index, values, capability, remaining_elements, *realm.intrinsics().function_prototype()).release_allocated_value_but_fixme_should_propagate_errors(); } -PromiseAllSettledResolveElementFunction::PromiseAllSettledResolveElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) +PromiseAllSettledResolveElementFunction::PromiseAllSettledResolveElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) : PromiseResolvingElementFunction(index, values, capability, remaining_elements, prototype) { } @@ -128,12 +128,12 @@ ThrowCompletionOr PromiseAllSettledResolveElementFunction::resolve_elemen return js_undefined(); } -NonnullGCPtr PromiseAllSettledRejectElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) +NonnullGCPtr PromiseAllSettledRejectElementFunction::create(Realm& realm, size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements) { return realm.heap().allocate(realm, index, values, capability, remaining_elements, *realm.intrinsics().function_prototype()).release_allocated_value_but_fixme_should_propagate_errors(); } -PromiseAllSettledRejectElementFunction::PromiseAllSettledRejectElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) +PromiseAllSettledRejectElementFunction::PromiseAllSettledRejectElementFunction(size_t index, PromiseValueList& values, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) : PromiseResolvingElementFunction(index, values, capability, remaining_elements, prototype) { } @@ -169,12 +169,12 @@ ThrowCompletionOr PromiseAllSettledRejectElementFunction::resolve_element return js_undefined(); } -NonnullGCPtr PromiseAnyRejectElementFunction::create(Realm& realm, size_t index, PromiseValueList& errors, NonnullGCPtr capability, RemainingElements& remaining_elements) +NonnullGCPtr PromiseAnyRejectElementFunction::create(Realm& realm, size_t index, PromiseValueList& errors, NonnullGCPtr capability, RemainingElements& remaining_elements) { return realm.heap().allocate(realm, index, errors, capability, remaining_elements, *realm.intrinsics().function_prototype()).release_allocated_value_but_fixme_should_propagate_errors(); } -PromiseAnyRejectElementFunction::PromiseAnyRejectElementFunction(size_t index, PromiseValueList& errors, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) +PromiseAnyRejectElementFunction::PromiseAnyRejectElementFunction(size_t index, PromiseValueList& errors, NonnullGCPtr capability, RemainingElements& remaining_elements, Object& prototype) : PromiseResolvingElementFunction(index, errors, capability, remaining_elements, prototype) { } diff --git a/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.h b/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.h index 8fb3c75960..0d6732c2fa 100644 --- a/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.h +++ b/Userland/Libraries/LibJS/Runtime/PromiseResolvingElementFunctions.h @@ -51,13 +51,13 @@ public: virtual ThrowCompletionOr call() override; protected: - explicit PromiseResolvingElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); + explicit PromiseResolvingElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); virtual ThrowCompletionOr resolve_element() = 0; size_t m_index { 0 }; PromiseValueList& m_values; - NonnullGCPtr m_capability; + NonnullGCPtr m_capability; RemainingElements& m_remaining_elements; private: @@ -71,12 +71,12 @@ class PromiseAllResolveElementFunction final : public PromiseResolvingElementFun JS_OBJECT(PromiseResolvingFunction, NativeFunction); public: - static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); + static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); virtual ~PromiseAllResolveElementFunction() override = default; private: - explicit PromiseAllResolveElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); + explicit PromiseAllResolveElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); virtual ThrowCompletionOr resolve_element() override; }; @@ -86,12 +86,12 @@ class PromiseAllSettledResolveElementFunction final : public PromiseResolvingEle JS_OBJECT(PromiseResolvingFunction, NativeFunction); public: - static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); + static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); virtual ~PromiseAllSettledResolveElementFunction() override = default; private: - explicit PromiseAllSettledResolveElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); + explicit PromiseAllSettledResolveElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); virtual ThrowCompletionOr resolve_element() override; }; @@ -101,12 +101,12 @@ class PromiseAllSettledRejectElementFunction final : public PromiseResolvingElem JS_OBJECT(PromiseResolvingFunction, PromiseResolvingElementFunction); public: - static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); + static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); virtual ~PromiseAllSettledRejectElementFunction() override = default; private: - explicit PromiseAllSettledRejectElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); + explicit PromiseAllSettledRejectElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); virtual ThrowCompletionOr resolve_element() override; }; @@ -116,12 +116,12 @@ class PromiseAnyRejectElementFunction final : public PromiseResolvingElementFunc JS_OBJECT(PromiseResolvingFunction, PromiseResolvingElementFunction); public: - static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); + static NonnullGCPtr create(Realm&, size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&); virtual ~PromiseAnyRejectElementFunction() override = default; private: - explicit PromiseAnyRejectElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); + explicit PromiseAnyRejectElementFunction(size_t, PromiseValueList&, NonnullGCPtr, RemainingElements&, Object& prototype); virtual ThrowCompletionOr resolve_element() override; }; diff --git a/Userland/Libraries/LibJS/Runtime/SetPrototype.cpp b/Userland/Libraries/LibJS/Runtime/SetPrototype.cpp index 77f9f8df33..cd994e5ed7 100644 --- a/Userland/Libraries/LibJS/Runtime/SetPrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/SetPrototype.cpp @@ -126,7 +126,7 @@ JS_DEFINE_NATIVE_FUNCTION(SetPrototype::size_getter) // 8 Set Records, https://tc39.es/proposal-set-methods/#sec-set-records struct SetRecord { - NonnullGCPtr set; // [[Set]] + NonnullGCPtr set; // [[Set]] double size { 0 }; // [[Size] NonnullGCPtr has; // [[Has]] NonnullGCPtr keys; // [[Keys]]