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 828244 - Part a: Pass MutableHandleId to ValueToIdentifier; r=terrence

Browse Source
This commit is contained in:
Ms2ger 2013-01-11 09:42:59 +01:00
parent effe119b3d
commit 475b80c39b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/vm/Debugger.cpp
View File

@ -106,10 +106,9 @@ ReportObjectRequired(JSContext *cx)
}
bool
ValueToIdentifier(JSContext *cx, const Value &v, jsid *idp)
ValueToIdentifier(JSContext *cx, const Value &v, MutableHandleId id)
{
jsid id;
if (!ValueToId(cx, v, &id))
if (!ValueToId(cx, v, id.address()))
return false;
if (!JSID_IS_ATOM(id) || !IsIdentifier(JSID_TO_ATOM(id))) {
RootedValue val(cx, v);
@ -117,7 +116,6 @@ ValueToIdentifier(JSContext *cx, const Value &v, jsid *idp)
JSDVG_SEARCH_STACK, val, NullPtr(), "not an identifier", NULL);
return false;
}
*idp = id;
return true;
}
@ -4802,7 +4800,7 @@ DebuggerEnv_find(JSContext *cx, unsigned argc, Value *vp)
THIS_DEBUGENV_OWNER(cx, argc, vp, "find", args, envobj, env, dbg);
RootedId id(cx);
if (!ValueToIdentifier(cx, args[0], id.address()))
if (!ValueToIdentifier(cx, args[0], &id))
return false;
{
@ -4833,7 +4831,7 @@ DebuggerEnv_getVariable(JSContext *cx, unsigned argc, Value *vp)
THIS_DEBUGENV_OWNER(cx, argc, vp, "getVariable", args, envobj, env, dbg);
RootedId id(cx);
if (!ValueToIdentifier(cx, args[0], id.address()))
if (!ValueToIdentifier(cx, args[0], &id))
return false;
RootedValue v(cx);
@ -4862,7 +4860,7 @@ DebuggerEnv_setVariable(JSContext *cx, unsigned argc, Value *vp)
THIS_DEBUGENV_OWNER(cx, argc, vp, "setVariable", args, envobj, env, dbg);
RootedId id(cx);
if (!ValueToIdentifier(cx, args[0], id.address()))
if (!ValueToIdentifier(cx, args[0], &id))
return false;
RootedValue v(cx, args[1]);