corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge mozilla-central into tracemonkey

Browse Source
This commit is contained in:
Vladimir Vukicevic
2008-11-18 13:54:21 -08:00
parent 5a0bea534a bf34a8e26c
commit e5ab72d100
64 changed files with 997 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsopcode.cpp
View File

@@ -4987,7 +4987,6 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
* it that caused exception, see bug 328664.
*/
stackBase = StackBase(fp);
JS_ASSERT((size_t) (regs->sp - stackBase) <= StackDepth(script));
sp = regs->sp;
do {
if (sp == stackBase) {
@@ -4998,9 +4997,10 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
if (sp >= stackBase + pcdepth) {
/*
* This happens when the value comes from a temporary slot
* that the interpreter uses for GC roots. Assume that it is
* fp->pc that caused the exception.
* The value comes from a temporary slot that the interpreter
* uses for GC roots or when JSOP_APPLY extended the stack to
* fit the argument array elements. Assume that it is the
* current PC that caused the exception.
*/
pc = fp->imacpc ? fp->imacpc : regs->pc;
} else {