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

Revert "Bug 797496 - Ignore hidden PC even with try notes. r=luke"

Browse Source 
This reverts changeset 3b7a134bc3aa.
This commit is contained in:
Nicolas B. Pierron 2012-10-04 12:35:03 -07:00
parent 795fee3471
commit 1b58fc7bc1
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jit-test/tests/basic/bug797496.js
View File

@ -1,8 +0,0 @@
// |jit-test| error: TypeError
var set = Set(['a']);
var n = 5;
for (let v of set) {
if (n === 0)
break;
let g = set(Set(0xffffffff, n), 1);
}

12
js/src/jsopcode.cpp
View File

@ -6436,11 +6436,16 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *target, jsbyteco
continue;
}
if (!script->hasTrynotes()) {
/* Use the normal pc count if continue after the goto */
hpcdepth = unsigned(-1);
continue;
}
/*
* If we do not follow a goto we look for another mean to continue
* at the next PC.
*/
if (script->hasTrynotes()) {
JSTryNote *tn = script->trynotes()->vector;
JSTryNote *tnEnd = tn + script->trynotes()->length;
for (; tn != tnEnd; tn++) {
@ -6457,7 +6462,6 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *target, jsbyteco
pc = script->main() + tn->start + tn->length;
continue;
}
}
/*
* JSOP_THROWING compensates for hidden JSOP_DUP at the start of the
@ -6465,10 +6469,6 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *target, jsbyteco
*/
if (JSOp(*(pc + oplen)) == JSOP_THROWING)
hpcdepth = pcdepth + 2;
else
/* Use the normal pc count if continue after the goto */
hpcdepth = unsigned(-1);
continue;
}