From dfc19c66e1c64d147d579e80c3db09a3dabcc292 Mon Sep 17 00:00:00 2001
From: "igor%mir2.org" <igor%mir2.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 12 Mar 2002 22:02:55 +0000
Subject: [PATCH] Rename catchStack to tryStack and allocate it only when
 required

git-svn-id: svn://10.0.0.236/trunk@116429 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../org/mozilla/javascript/Interpreter.java   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
index 6faffaf1497..07ef9bf8fbd 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
@@ -1453,21 +1453,17 @@ public class Interpreter extends LabelTable {
         int rIntValue;
         double rDbl;
 
-        int[] catchStack = null;
+// tryStack[2 * i]: starting pc of catch block
+// tryStack[2 * i + 1]: starting pc of finally block
+        int[] tryStack = null;
         int tryStackTop = 0;
-        InterpreterFrame frame = null;
 
+        InterpreterFrame frame = null;
         if (cx.debugger != null) {
             frame = new InterpreterFrame(scope, theData, fnOrScript);
             cx.pushFrame(frame);
         }
 
-        if (maxTryDepth != 0) {
-            // catchStack[2 * i]: starting pc of catch block
-            // catchStack[2 * i + 1]: starting pc of finally block
-            catchStack = new int[maxTryDepth * 2];
-        }
-
         /* Save the security domain. Must restore upon normal exit.
          * If we exit the interpreter loop by throwing an exception,
          * set cx.interpreterSecurityDomain to null, and require the
@@ -1493,12 +1489,15 @@ public class Interpreter extends LabelTable {
                         tryStackTop--;
                         break;
                     case TokenStream.TRY :
+                        if (tryStackTop == 0) {
+                            tryStack = new int[maxTryDepth * 2];
+                        }
                         i = getTarget(iCode, pc + 1);
                         if (i == pc) i = 0;
-                        catchStack[tryStackTop * 2] = i;
+                        tryStack[tryStackTop * 2] = i;
                         i = getTarget(iCode, pc + 3);
                         if (i == (pc + 2)) i = 0;
-                        catchStack[tryStackTop * 2 + 1] = i;
+                        tryStack[tryStackTop * 2 + 1] = i;
                         stack[TRY_SCOPE_SHFT + tryStackTop] = scope;
                         ++tryStackTop;
                         pc += 4;
@@ -2244,14 +2243,14 @@ public class Interpreter extends LabelTable {
                     if (exType == SCRIPT_THROW || exType == ECMA) {
                         // Check for catch only for
                         // JavaScriptException and EcmaError
-                        pc = catchStack[tryStackTop * 2];
+                        pc = tryStack[tryStackTop * 2];
                         if (pc != 0) {
                             // Has catch block
                             rethrow = false;
                         }
                     }
                     if (rethrow) {
-                        pc = catchStack[tryStackTop * 2 + 1];
+                        pc = tryStack[tryStackTop * 2 + 1];
                         if (pc != 0) {
                             // has finally block
                             rethrow = false;