Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 403878 - Replacing js_InternalCall with js_Invoke in Array.sort for arrays with scripted compator functions -- save alloc/free on each compare r=ibukanov, a=blocking1.9+

Browse Source
This commit is contained in:
crowder@fiverocks.com 2007-11-20 10:07:13 -08:00
parent 74e478d629
commit 0285efe60d
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/src/jsarray.c
View File

@ -994,6 +994,7 @@ typedef struct CompareArgs {
JSContext *context;
jsval fval;
jsval *localroot; /* need one local root, for sort_compare */
jsval *elemroot; /* stack needed for js_Invoke */
} CompareArgs;
static JSBool
@ -1037,16 +1038,19 @@ sort_compare(void *arg, const void *a, const void *b, int *result)
ok = JS_FALSE;
}
} else {
jsval *invokevp, *sp;
jsdouble cmp;
jsval argv[2];
argv[0] = av;
argv[1] = bv;
ok = js_InternalCall(cx,
OBJ_GET_PARENT(cx, JSVAL_TO_OBJECT(fval)),
fval, 2, argv, ca->localroot);
invokevp = ca->elemroot;
sp = invokevp;
*sp++ = ca->fval;
*sp++ = JSVAL_NULL;
*sp++ = av;
*sp++ = bv;
ok = js_Invoke(cx, 2, invokevp, JSINVOKE_INTERNAL);
if (ok) {
ok = js_ValueToNumber(cx, *ca->localroot, &cmp);
ok = js_ValueToNumber(cx, *invokevp, &cmp);
/* Clamp cmp to -1, 0, 1. */
if (ok) {
@ -1221,13 +1225,21 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
ok = js_MergeSort(vec, (size_t) newlen, sizeof(jsval),
sort_compare_strings, cx, mergesort_tmp);
} else {
void *mark;
ca.context = cx;
ca.fval = fval;
/* local GC root for temporary string */
ca.localroot = &vec[tvr.count++];
*ca.localroot = JSVAL_NULL;
ca.elemroot = js_AllocStack(cx, 2 + 2, &mark);
if (!ca.elemroot) {
ok = JS_FALSE;
goto out;
}
ok = js_MergeSort(vec, (size_t) newlen, sizeof(jsval),
sort_compare, &ca, mergesort_tmp);
js_FreeStack(cx, mark);
}
if (!ok)
goto out;