tor-browser

commit a678357256fe842a277beab5cfa5771b3b4419b7
parent a99f99fe918131e0acf6cf7c1f83ebe20828572a
Author: Matthew Gaudet <mgaudet@mozilla.com>
Date:   Fri, 12 Dec 2025 03:10:36 +0000

Bug 2005626 - Avoid repeated cx->check calls r=arai

Differential Revision: https://phabricator.services.mozilla.com/D276092

Diffstat:
M
js/src/builtin/Eval.cpp
 | 
3
+--
M
js/src/builtin/Promise.cpp
 | 
29
++++++++---------------------
M
js/src/jsapi.cpp
 | 
3
+--

3 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
@@ -415,8 +415,7 @@ static bool ExecuteInExtensibleLexicalEnvironment(
     JSContext* cx, HandleScript scriptArg,
     Handle<ExtensibleLexicalEnvironmentObject*> env) {
   CHECK_THREAD(cx);
-  cx->check(env);
-  cx->check(scriptArg);
+  cx->check(env, scriptArg);
   MOZ_RELEASE_ASSERT(scriptArg->hasNonSyntacticScope());
 
   RootedValue rval(cx);
diff --git a/js/src/builtin/Promise.cpp b/js/src/builtin/Promise.cpp
@@ -392,9 +392,7 @@ PromiseCombinatorDataHolder* PromiseCombinatorDataHolder::New(
     return nullptr;
   }
 
-  cx->check(resultPromise);
-  cx->check(elements.value());
-  cx->check(resolveOrReject);
+  cx->check(resultPromise, elements.value(), resolveOrReject);
 
   dataHolder->setFixedSlot(Slot_Promise, ObjectValue(*resultPromise));
   dataHolder->setFixedSlot(Slot_RemainingElements, Int32Value(1));
@@ -3805,9 +3803,7 @@ static bool CallDefaultPromiseRejectFunction(
                                                      HandleObject resolveFun,
                                                      HandleValue value,
                                                      HandleObject promiseObj) {
-  cx->check(resolveFun);
-  cx->check(value);
-  cx->check(promiseObj);
+  cx->check(resolveFun, value, promiseObj);
 
   // NewPromiseReactionJob
   // Step 1.g. Assert: promiseCapability is a PromiseCapability Record.
@@ -3877,9 +3873,7 @@ static bool CallDefaultPromiseRejectFunction(
     JSContext* cx, HandleObject rejectFun, HandleValue reason,
     HandleObject promiseObj, Handle<SavedFrame*> unwrappedRejectionStack,
     UnhandledRejectionBehavior behavior) {
-  cx->check(rejectFun);
-  cx->check(reason);
-  cx->check(promiseObj);
+  cx->check(rejectFun, reason, promiseObj);
 
   // NewPromiseReactionJob
   // Step 1.g. Assert: promiseCapability is a PromiseCapability Record.
@@ -5657,13 +5651,9 @@ static PromiseReactionRecord* NewReactionRecord(
   if (!reaction) {
     return nullptr;
   }
-
-  cx->check(resultCapability.promise());
-  cx->check(onFulfilled);
-  cx->check(onRejected);
-  cx->check(resultCapability.resolve());
-  cx->check(resultCapability.reject());
-  cx->check(hostDefinedData);
+  cx->check(resultCapability.promise(), onFulfilled, onRejected,
+            resultCapability.resolve(), resultCapability.reject(),
+            hostDefinedData);
 
   // Step 7. Let fulfillReaction be the PromiseReaction
   //         { [[Capability]]: resultCapability, [[Type]]: Fulfill,
@@ -5758,9 +5748,7 @@ static bool PromiseThenNewPromiseCapability(
                                                      HandleObject promiseObj,
                                                      HandleObject onFulfilled,
                                                      HandleObject onRejected) {
-  cx->check(promiseObj);
-  cx->check(onFulfilled);
-  cx->check(onRejected);
+  cx->check(promiseObj, onFulfilled, onRejected);
 
   RootedValue promiseVal(cx, ObjectValue(*promiseObj));
   Rooted<PromiseObject*> unwrappedPromise(
@@ -5836,8 +5824,7 @@ static bool PromiseThenNewPromiseCapability(
     JSContext* cx, Handle<PromiseObject*> unwrappedPromise,
     HandleObject onFulfilled_, HandleObject onRejected_,
     UnhandledRejectionBehavior behavior) {
-  cx->check(onFulfilled_);
-  cx->check(onRejected_);
+  cx->check(onFulfilled_, onRejected_);
 
   MOZ_ASSERT_IF(onFulfilled_, IsCallable(onFulfilled_));
   MOZ_ASSERT_IF(onRejected_, IsCallable(onRejected_));
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
@@ -1677,8 +1677,7 @@ JS_PUBLIC_API bool JS_InstanceOf(JSContext* cx, HandleObject obj,
   CHECK_THREAD(cx);
 #ifdef DEBUG
   if (args) {
-    cx->check(obj);
-    cx->check(args->thisv(), args->calleev());
+    cx->check(obj, args->thisv(), args->calleev());
   }
 #endif
   if (!obj || obj->getClass() != clasp) {