wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 959695 part 2. Make ReportIfNotFunction take a Handle. r=terrence

Browse Source
This commit is contained in:
Boris Zbarsky 2014-01-14 21:46:43 -05:00
parent d974ba4f3c
commit 063d4ec39a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsapi.cpp
View File

@ -228,7 +228,8 @@ JS_ConvertArgumentsVA(JSContext *cx, unsigned argc, jsval *argv, const char *for
}
if (sp == argv + argc) {
if (required) {
if (JSFunction *fun = ReportIfNotFunction(cx, argv[-2])) {
HandleValue callee = HandleValue::fromMarkedLocation(&argv[-2]);
if (JSFunction *fun = ReportIfNotFunction(cx, callee)) {
char numBuf[12];
JS_snprintf(numBuf, sizeof numBuf, "%u", argc);
JSAutoByteString funNameBytes;
@ -298,7 +299,7 @@ JS_ConvertArgumentsVA(JSContext *cx, unsigned argc, jsval *argv, const char *for
*va_arg(ap, JSObject **) = obj;
break;
case 'f':
obj = ReportIfNotFunction(cx, *sp);
obj = ReportIfNotFunction(cx, HandleValue::fromMarkedLocation(sp));
if (!obj)
return false;
*sp = OBJECT_TO_JSVAL(obj);

2
js/src/vm/Interpreter-inl.h
View File

@ -637,7 +637,7 @@ UrshOperation(JSContext *cx, HandleValue lhs, HandleValue rhs, Value *out)
#undef RELATIONAL_OP
inline JSFunction *
ReportIfNotFunction(JSContext *cx, const Value &v, MaybeConstruct construct = NO_CONSTRUCT)
ReportIfNotFunction(JSContext *cx, HandleValue v, MaybeConstruct construct = NO_CONSTRUCT)
{
if (v.isObject() && v.toObject().is<JSFunction>())
return &v.toObject().as<JSFunction>();