Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 60093

Browse Source
This commit is contained in:
nboyd%atg.com 2000-12-05 16:04:32 +00:00
parent b9aa03d8cf
commit 86d5be2297
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,8 +241,7 @@ public class Interpreter extends LabelTable {
+ node.toString());
}
private int generateICode(Node node, int iCodeTop)
{
private int generateICode(Node node, int iCodeTop) {
int type = node.getType();
Node child = node.getFirstChild();
Node firstChild = child;
@ -846,6 +845,7 @@ public class Interpreter extends LabelTable {
set the stackDepth to 1 to account for the incoming
exception object.
*/
boolean insertedEndTry = false;
while (child != null) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
@ -860,11 +860,13 @@ public class Interpreter extends LabelTable {
before that goto.
*/
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
if (!insertedEndTry && nextSibling != null &&
(nextSibling == catchTarget ||
nextSibling == finallyTarget))
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
insertedEndTry = true;
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;

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

@ -241,8 +241,7 @@ public class Interpreter extends LabelTable {
+ node.toString());
}
private int generateICode(Node node, int iCodeTop)
{
private int generateICode(Node node, int iCodeTop) {
int type = node.getType();
Node child = node.getFirstChild();
Node firstChild = child;
@ -846,6 +845,7 @@ public class Interpreter extends LabelTable {
set the stackDepth to 1 to account for the incoming
exception object.
*/
boolean insertedEndTry = false;
while (child != null) {
if (catchTarget != null && lastChild == catchTarget) {
itsStackDepth = 1;
@ -860,11 +860,13 @@ public class Interpreter extends LabelTable {
before that goto.
*/
Node nextSibling = child.getNextSibling();
if (nextSibling == catchTarget ||
nextSibling == finallyTarget)
if (!insertedEndTry && nextSibling != null &&
(nextSibling == catchTarget ||
nextSibling == finallyTarget))
{
iCodeTop = addByte((byte) TokenStream.ENDTRY,
iCodeTop);
insertedEndTry = true;
}
iCodeTop = generateICode(child, iCodeTop);
lastChild = child;