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

In Interpreter.interpret move initialization of debug frame after the setup of nested functions so they are visible to debugger on debug frame creation

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@118488 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
igor%mir2.org
2002-04-08 21:52:10 +00:00
parent 2d421b1732
commit 74d361a0fd
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,9 +165,7 @@ public class Interpreter extends LabelTable {
VariableTable varTable = (VariableTable)tree.getProp(Node.VARS_PROP);
// The default is not to generate debug information
boolean activationNeeded = cx.isGeneratingDebugChanged() &&
cx.isGeneratingDebug();
generateICodeFromTree(tree, varTable, activationNeeded, securityDomain);
generateICodeFromTree(tree, varTable, false, securityDomain);
itsData.itsNestedFunctions = itsNestedFunctions;
itsData.itsRegExpLiterals = regExpLiterals;
if (Context.printICode) dumpICode(itsData);
@@ -1498,10 +1496,11 @@ public class Interpreter extends LabelTable {
}else if (!theData.itsUseDynamicScope) {
scope = fnOrScript.getParentScope();
}
if (theData.itsCheckThis) {
thisObj = ScriptRuntime.getThis(thisObj);
}
if (theData.itsNeedsActivation) {
scope = ScriptRuntime.initVarObj(cx, scope, fnOrScript,
thisObj, args);
@@ -1512,18 +1511,18 @@ public class Interpreter extends LabelTable {
theData.itsFromEvalCode);
}
DebugFrame frame = null;
if (cx.debugger != null) {
frame = cx.debugger.enterFrame(cx, scope, thisObj, args,
(DebuggableScript)fnOrScript);
}
if (theData.itsNestedFunctions != null) {
for (int i = 0; i < theData.itsNestedFunctions.length; i++)
createFunctionObject(theData.itsNestedFunctions[i], scope,
theData.itsFromEvalCode);
}
DebugFrame frame = null;
if (cx.debugger != null) {
frame = cx.debugger.enterFrame(cx, scope, thisObj, args,
(DebuggableScript)fnOrScript);
}
Object result = undefined;
byte[] iCode = theData.itsICode;