Bug 1429028: Remove unused JSContext arg to CheckRecursionLimitDontReport; r=jandem
MozReview-Commit-ID: DXPsnTVjvok
--- 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);