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 787848 - Handle JSOP_THROWING opcode in the decompiler. r=luke

Browse Source
This commit is contained in:
Nicolas B. Pierron 2012-09-29 00:43:23 -07:00
parent 10d4f193a6
commit 703212a4f5
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jit-test/tests/basic/bug787848.js Normal file
View File

@ -0,0 +1,8 @@
// |jit-test| error: TypeError
try {
i
}
catch (x if (function() {})()) {}
catch (d) {
this.z.z
}

15
js/src/jsopcode.cpp
View File

@ -6441,8 +6441,10 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *target,
if (!script->hasTrynotes())
continue;
// If we do not follow a goto we look for another mean to continue
// at the next PC.
/*
* If we do not follow a goto we look for another mean to continue
* at the next PC.
*/
JSTryNote *tn = script->trynotes()->vector;
JSTryNote *tnEnd = tn + script->trynotes()->length;
for (; tn != tnEnd; tn++) {
@ -6451,12 +6453,21 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *target,
if (start < pc && pc <= end && end <= target)
break;
}
if (tn != tnEnd) {
pcdepth = tn->stackDepth;
hpcdepth = unsigned(-1);
oplen = 0;
pc = script->main() + tn->start + tn->length;
continue;
}
/*
* JSOP_THROWING compensates for hidden JSOP_DUP at the start of the
* previous guarded catch (see EmitTry in BytecodeEmitter.cpp).
*/
if (JSOp(*(pc + oplen)) == JSOP_THROWING)
hpcdepth = pcdepth + 2;
continue;
}