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

Rename catchStack to tryStack and allocate it only when required

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116429 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
igor%mir2.org 2002-03-12 22:02:55 +00:00
parent 36790db5a9
commit dfc19c66e1
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;