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

Bug 491988 - Annotation fixes required for analyzing JS_REQUIRES_STACK for function pointers, r=jorendorff

Browse Source
This commit is contained in:
Benjamin Smedberg
2009-06-25 15:12:19 -04:00
parent ca98f3be97
commit 23286a7234
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsarray.cpp
View File

@@ -2022,6 +2022,15 @@ sort_compare(void *arg, const void *a, const void *b, int *result)
return JS_TRUE;
}
typedef JSBool (JS_REQUIRES_STACK *JSRedComparator)(void*, const void*,
const void*, int *);
static inline JS_IGNORE_STACK JSComparator
comparator_stack_cast(JSRedComparator func)
{
return func;
}
static int
sort_compare_strings(void *arg, const void *a, const void *b, int *result)
{
@@ -2263,7 +2272,8 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
goto out;
}
ok = js_MergeSort(vec, (size_t) newlen, sizeof(jsval),
sort_compare, &ca, mergesort_tmp);
comparator_stack_cast(sort_compare),
&ca, mergesort_tmp);
js_FreeStack(cx, mark);
if (!ok)
goto out;