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

Merge.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-15 20:16:46 -07:00
commit b9e946d830
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jstracer.cpp
View File

@ -605,9 +605,10 @@ TypeMap::captureStackTypes(JSContext* cx, unsigned callDepth)
uint8* m = map;
FORALL_SLOTS_IN_PENDING_FRAMES(cx, callDepth,
uint8 type = getCoercedType(*vp);
if ((type == JSVAL_INT) && oracle.isStackSlotUndemotable(cx->fp->script,
cx->fp->regs->pc, unsigned(m - map)))
if ((type == JSVAL_INT) &&
oracle.isStackSlotUndemotable(cx->fp->script, cx->fp->regs->pc, unsigned(m - map))) {
type = JSVAL_DOUBLE;
}
*m++ = type;
);
}
@ -1360,7 +1361,7 @@ TraceRecorder::closeLoop(Fragmento* fragmento)
return;
}
if (treeInfo->maxNativeStackSlots >= MAX_NATIVE_STACK_SLOTS) {
debug_only(printf("Trace rejected: excess stack use.\n"));
debug_only(printf("Trace rejected: excessive stack use.\n"));
fragment->blacklist();
return;
}
@ -3516,7 +3517,7 @@ TraceRecorder::interpretedFunctionCall(jsval& fval, JSFunction* fun, uintN argc)
{
JSStackFrame* fp = cx->fp;
// TODO: make sure args are not copied, or track the copying via the tracker
// TODO: track the copying via the tracker...
if (argc < fun->nargs &&
jsuword(fp->regs->sp + (fun->nargs - argc)) > cx->stackPool.current->limit) {
ABORT_TRACE("can't trace calls with too few args requiring argv move");