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 587809 final: fix nits in version 'pre-landed' on JM, r=jorendorff

Browse Source
This commit is contained in:
David Mandelin 2010-09-01 17:52:23 -07:00
parent 966c4ef40f
commit 747c4fc309
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jstracer.cpp
View File

@ -9909,20 +9909,20 @@ TraceRecorder::getThis(LIns*& this_ins)
// object, which we can burn into the trace.
JS_ASSERT(!fp->argv);
JS_ASSERT(!fp->getThisValue().isPrimitive());
JS_ASSERT(fp->getThisValue().isObject());
#ifdef DEBUG
JSObject *obj = globalObj->thisObject(cx);
if (!obj)
RETURN_ERROR("thisObject hook failed");
JS_ASSERT(fp->getThisValue().toObjectOrNull() == obj);
JS_ASSERT(&fp->getThisValue().toObject() == obj);
#endif
this_ins = INS_CONSTOBJ(fp->getThisValue().toObjectOrNull());
this_ins = INS_CONSTOBJ(&fp->getThisValue().toObject());
return RECORD_CONTINUE;
}
Value& thisv = fp->argv[-1];
const Value& thisv = fp->argv[-1];
JS_ASSERT(thisv == fp->getThisValue() || fp->getThisValue().isNull());
JS_ASSERT(fp->callee()->getGlobal() == globalObj);
@ -9945,7 +9945,7 @@ TraceRecorder::getThis(LIns*& this_ins)
JSObject *obj = fp->getThisObject(cx);
if (!obj)
RETURN_ERROR("getThisObject failed");
JS_ASSERT(fp->argv[-1] == ObjectOrNullValue(obj));
JS_ASSERT(fp->argv[-1] == ObjectValue(*obj));
this_ins = INS_CONSTOBJ(obj);
set(&fp->argv[-1], this_ins);
return RECORD_CONTINUE;