Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 56185.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@81028 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nboyd%atg.com 2000-10-12 16:10:55 +00:00
parent 0503a645d7
commit 48d08a8a57
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/js/rhino/org/mozilla/javascript/Interpreter.java
View File

@ -493,8 +493,7 @@ public class Interpreter extends LabelTable {
*/
Node target = (Node)(node.getProp(Node.TARGET_PROP));
target.putProp(Node.FINALLY_PROP, node);
iCodeTop = addGoto(node, TokenStream.GOSUB,
iCodeTop);
iCodeTop = addGoto(node, TokenStream.GOSUB, iCodeTop);
}
break;
@ -848,20 +847,25 @@ public class Interpreter extends LabelTable {
exception object.
*/
while (child != null) {
if (lastChild == catchTarget) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
if (itsStackDepth > itsData.itsMaxStack)
itsData.itsMaxStack = itsStackDepth;
}
/*
When the following child is the catchTarget,
When the following child is the catchTarget
(or the finallyTarget if there are no catches),
the current child is the goto at the end of
the try statemets, we need to emit the endtry
before that goto.
*/
if (child.getNextSibling() == catchTarget)
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
iCodeTop);
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;
child = child.getNextSibling();

16
mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
View File

@ -493,8 +493,7 @@ public class Interpreter extends LabelTable {
*/
Node target = (Node)(node.getProp(Node.TARGET_PROP));
target.putProp(Node.FINALLY_PROP, node);
iCodeTop = addGoto(node, TokenStream.GOSUB,
iCodeTop);
iCodeTop = addGoto(node, TokenStream.GOSUB, iCodeTop);
}
break;
@ -848,20 +847,25 @@ public class Interpreter extends LabelTable {
exception object.
*/
while (child != null) {
if (lastChild == catchTarget) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
if (itsStackDepth > itsData.itsMaxStack)
itsData.itsMaxStack = itsStackDepth;
}
/*
When the following child is the catchTarget,
When the following child is the catchTarget
(or the finallyTarget if there are no catches),
the current child is the goto at the end of
the try statemets, we need to emit the endtry
before that goto.
*/
if (child.getNextSibling() == catchTarget)
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
iCodeTop);
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;
child = child.getNextSibling();