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

Guard on the JSFunction and parent pointers instead of the identity of the function object in case of shapeless calls (451974, r=brendan).

Browse Source
This commit is contained in:
Andreas Gal 2008-12-01 16:44:22 -08:00
parent bfd4fe191d
commit a78d7744c8
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/jstracer.cpp
View File

@ -5748,7 +5748,12 @@ TraceRecorder::functionCall(bool constructing)
jsval& tval = stackval(0 - (argc + 1)); jsval& tval = stackval(0 - (argc + 1));
LIns* this_ins = get(&tval); LIns* this_ins = get(&tval);
if (this_ins->isconstp() && !this_ins->constvalp() && !guardShapelessCallee(fval)) /*
* If this is NULL, this is a shapeless call. If we observe a shapeless call
* at recording time, the call at this point will always be shapeless so we
* can make the decision based on recording-time introspection of this.
*/
if (tval == JSVAL_NULL && !guardShapelessCallee(fval))
return false; return false;
/* /*
@ -6453,10 +6458,21 @@ TraceRecorder::record_JSOP_CALLUPVAR()
bool bool
TraceRecorder::guardShapelessCallee(jsval& callee) TraceRecorder::guardShapelessCallee(jsval& callee)
{ {
LIns* exit = snapshot(BRANCH_EXIT);
JSObject* callee_obj = JSVAL_TO_OBJECT(callee);
LIns* callee_ins = get(&callee);
guard(true, guard(true,
addName(lir->ins2(LIR_eq, get(&callee), INS_CONSTPTR(JSVAL_TO_OBJECT(callee))), lir->ins2(LIR_eq,
"guard(shapeless callee)"), lir->ins2(LIR_piand,
MISMATCH_EXIT); stobj_get_fslot(callee_ins, JSSLOT_PRIVATE),
INS_CONSTPTR((void*)(~JSVAL_INT))),
INS_CONSTPTR(OBJ_GET_PRIVATE(cx, callee_obj))),
exit);
guard(true,
lir->ins2(LIR_eq,
stobj_get_fslot(callee_ins, JSSLOT_PARENT),
INS_CONSTPTR(OBJ_GET_PARENT(cx, callee_obj))),
exit);
return true; return true;
} }