Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-06 00:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 847728 - Fix an intermittent rooting analysis failure; r=sfink

Browse Source
This commit is contained in:
Terrence Cole 2013-03-29 18:43:02 -07:00
parent 87176fd272
commit 2f9b4094b4
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/src/shell/js.cpp
View File

@ -214,15 +214,17 @@ ReportException(JSContext *cx)
class ToStringHelper
{
public:
ToStringHelper(JSContext *aCx, jsval v, bool aThrow = false)
ToStringHelper(JSContext *aCx, HandleValue v, bool aThrow = false)
: cx(aCx), mStr(cx, JS_ValueToString(cx, v))
{
if (!aThrow && !mStr)
ReportException(cx);
JS_AddNamedStringRoot(cx, mStr.address(), "Value ToString helper");
}
~ToStringHelper() {
JS_RemoveStringRoot(cx, mStr.address());
ToStringHelper(JSContext *aCx, HandleId id, bool aThrow = false)
: cx(aCx), mStr(cx, JS_ValueToString(cx, IdToValue(id)))
{
if (!aThrow && !mStr)
ReportException(cx);
}
bool threw() { return !mStr; }
jsval getJSVal() { return STRING_TO_JSVAL(mStr); }
@ -237,13 +239,6 @@ class ToStringHelper
JSAutoByteString mBytes;
};
class IdStringifier : public ToStringHelper {
public:
IdStringifier(JSContext *cx, jsid id, bool aThrow = false)
: ToStringHelper(cx, IdToJsval(id), aThrow)
{ }
};
static char *
GetLine(FILE *file, const char * prompt)
{
@ -4026,7 +4021,7 @@ its_addProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue
if (!its_noisy)
return true;
IdStringifier idString(cx, id);
ToStringHelper idString(cx, id);
fprintf(gOutFile, "adding its property %s,", idString.getBytes());
ToStringHelper valueString(cx, vp);
fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
@ -4039,7 +4034,7 @@ its_delProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue
if (!its_noisy)
return true;
IdStringifier idString(cx, id);
ToStringHelper idString(cx, id);
fprintf(gOutFile, "deleting its property %s,", idString.getBytes());
ToStringHelper valueString(cx, vp);
fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
@ -4052,7 +4047,7 @@ its_getProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue
if (!its_noisy)
return true;
IdStringifier idString(cx, id);
ToStringHelper idString(cx, id);
fprintf(gOutFile, "getting its property %s,", idString.getBytes());
ToStringHelper valueString(cx, vp);
fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
@ -4062,7 +4057,7 @@ its_getProperty(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue
static JSBool
its_setProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, MutableHandleValue vp)
{
IdStringifier idString(cx, id);
ToStringHelper idString(cx, id);
if (its_noisy) {
fprintf(gOutFile, "setting its property %s,", idString.getBytes());
ToStringHelper valueString(cx, vp);
@ -4133,7 +4128,7 @@ its_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
MutableHandleObject objp)
{
if (its_noisy) {
IdStringifier idString(cx, id);
ToStringHelper idString(cx, id);
fprintf(gOutFile, "resolving its property %s, flags {%s}\n",
idString.getBytes(),
(flags & JSRESOLVE_ASSIGNING) ? "assigning" : "");
@ -4404,7 +4399,7 @@ env_setProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, Mut
#if !defined XP_OS2 && !defined SOLARIS
int rv;
IdStringifier idstr(cx, id, true);
ToStringHelper idstr(cx, id, true);
if (idstr.threw())
return false;
ToStringHelper valstr(cx, vp, true);
@ -4476,7 +4471,7 @@ env_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
JSString *valstr;
const char *name, *value;
IdStringifier idstr(cx, id, true);
ToStringHelper idstr(cx, id, true);
if (idstr.threw())
return false;