corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 498398 - fast natives such as array_sort and many others must not be JS_REQUIRES_STACK, r=jorendorff

Browse Source
This commit is contained in:
Benjamin Smedberg
2009-06-25 15:12:19 -04:00
parent 50b155af36
commit 9055de765a
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/jsarray.cpp
View File

@@ -1828,7 +1828,7 @@ typedef struct MSortArgs {
} MSortArgs;
/* Helper function for js_MergeSort. */
static JS_REQUIRES_STACK JSBool
static JSBool
MergeArrays(MSortArgs *msa, void *src, void *dest, size_t run1, size_t run2)
{
void *arg, *a, *b, *c;
@@ -1889,7 +1889,7 @@ MergeArrays(MSortArgs *msa, void *src, void *dest, size_t run1, size_t run2)
* This sort is stable, i.e. sequence of equal elements is preserved.
* See also bug #224128.
*/
JS_REQUIRES_STACK JSBool
JSBool
js_MergeSort(void *src, size_t nel, size_t elsize,
JSComparator cmp, void *arg, void *tmp)
{
@@ -2052,7 +2052,7 @@ sort_compare_strings(void *arg, const void *a, const void *b, int *result)
*/
JS_STATIC_ASSERT(JSVAL_NULL == 0);
static JS_REQUIRES_STACK JSBool
static JSBool
array_sort(JSContext *cx, uintN argc, jsval *vp)
{
jsval *argv, fval, *vec, *mergesort_tmp, v;
@@ -2264,6 +2264,8 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
} else {
void *mark;
js_LeaveTrace(cx);
ca.context = cx;
ca.fval = fval;
ca.elemroot = js_AllocStack(cx, 2 + 2, &mark);
@@ -3034,7 +3036,7 @@ typedef enum ArrayExtraMode {
#define REDUCE_MODE(mode) ((mode) == REDUCE || (mode) == REDUCE_RIGHT)
static JS_REQUIRES_STACK JSBool
static JSBool
array_extra(JSContext *cx, ArrayExtraMode mode, uintN argc, jsval *vp)
{
JSObject *obj;
@@ -3132,6 +3134,7 @@ array_extra(JSContext *cx, ArrayExtraMode mode, uintN argc, jsval *vp)
* For all but REDUCE, we call with 3 args (value, index, array). REDUCE
* requires 4 args (accum, value, index, array).
*/
js_LeaveTrace(cx);
argc = 3 + REDUCE_MODE(mode);
elemroot = js_AllocStack(cx, 1 + 2 + argc, &mark);
if (!elemroot)
@@ -3218,43 +3221,43 @@ array_extra(JSContext *cx, ArrayExtraMode mode, uintN argc, jsval *vp)
return ok;
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_forEach(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, FOREACH, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_map(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, MAP, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_reduce(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, REDUCE, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_reduceRight(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, REDUCE_RIGHT, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_filter(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, FILTER, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_some(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, SOME, argc, vp);
}
static JS_REQUIRES_STACK JSBool
static JSBool
array_every(JSContext *cx, uintN argc, jsval *vp)
{
return array_extra(cx, EVERY, argc, vp);