Bug 1429028: Remove unused JSContext arg to CheckRecursionLimitDontReport; r=jandem draft
authorBenjamin Bouvier <benj@benj.me>
Tue, 09 Jan 2018 14:29:08 +0100
changeset 719223 5877a68b5d71d095714be9d5910e87e8b116e007
parent 719211 6705010893cd6d0a72f6adbcb81a92f052a041c2
child 719224 66be4206150f75be6aa941b6625ce18fa3efdd84
push id95186
push userbbouvier@mozilla.com
push dateThu, 11 Jan 2018 17:38:36 +0000
reviewersjandem
bugs1429028
milestone59.0a1
Bug 1429028: Remove unused JSContext arg to CheckRecursionLimitDontReport; r=jandem MozReview-Commit-ID: DXPsnTVjvok
js/src/jsfriendapi.h
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1052,17 +1052,17 @@ CheckRecursionLimit(JSContext* cx, uintp
     if (!JS_CHECK_STACK_SIZE(limit, &stackDummy)) {
         ReportOverRecursed(cx);
         return false;
     }
     return true;
 }
 
 MOZ_ALWAYS_INLINE bool
-CheckRecursionLimitDontReport(JSContext* cx, uintptr_t limit)
+CheckRecursionLimitDontReport(uintptr_t limit)
 {
     int stackDummy;
 
     JS_STACK_OOM_POSSIBLY_FAIL();
 
     return JS_CHECK_STACK_SIZE(limit, &stackDummy);
 }
 
@@ -1071,25 +1071,25 @@ CheckRecursionLimit(JSContext* cx)
 {
     JS_STACK_OOM_POSSIBLY_FAIL_REPORT();
 
     // GetNativeStackLimit(cx) is pretty slow because it has to do an uninlined
     // call to RunningWithTrustedPrincipals to determine which stack limit to
     // use. To work around this, check the untrusted limit first to avoid the
     // overhead in most cases.
     uintptr_t untrustedLimit = GetNativeStackLimit(cx, JS::StackForUntrustedScript);
-    if (MOZ_LIKELY(CheckRecursionLimitDontReport(cx, untrustedLimit)))
+    if (MOZ_LIKELY(CheckRecursionLimitDontReport(untrustedLimit)))
         return true;
     return CheckRecursionLimit(cx, GetNativeStackLimit(cx));
 }
 
 MOZ_ALWAYS_INLINE bool
 CheckRecursionLimitDontReport(JSContext* cx)
 {
-    return CheckRecursionLimitDontReport(cx, GetNativeStackLimit(cx));
+    return CheckRecursionLimitDontReport(GetNativeStackLimit(cx));
 }
 
 MOZ_ALWAYS_INLINE bool
 CheckRecursionLimitWithStackPointerDontReport(JSContext* cx, void* sp)
 {
     JS_STACK_OOM_POSSIBLY_FAIL();
 
     return JS_CHECK_STACK_SIZE(GetNativeStackLimit(cx), sp);
@@ -1118,18 +1118,18 @@ CheckRecursionLimitConservative(JSContex
 {
     return CheckRecursionLimit(cx, GetNativeStackLimit(cx, JS::StackForUntrustedScript,
                                                        -1024 * int(sizeof(size_t))));
 }
 
 MOZ_ALWAYS_INLINE bool
 CheckRecursionLimitConservativeDontReport(JSContext* cx)
 {
-    return CheckRecursionLimitDontReport(cx, GetNativeStackLimit(cx, JS::StackForUntrustedScript,
-                                                                 -1024 * int(sizeof(size_t))));
+    return CheckRecursionLimitDontReport(GetNativeStackLimit(cx, JS::StackForUntrustedScript,
+                                                             -1024 * int(sizeof(size_t))));
 }
 
 JS_FRIEND_API(void)
 StartPCCountProfiling(JSContext* cx);
 
 JS_FRIEND_API(void)
 StopPCCountProfiling(JSContext* cx);