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

Fix Bug 492367 - Some function calls cause lots of execution stack information in interpreted mode

Browse Source 
Patch from Marc Guillemot.


git-svn-id: svn://10.0.0.236/trunk@257628 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nboyd%atg.com 2009-07-04 12:14:53 +00:00
parent 9266ce97d8
commit 60d4dfa119
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1687,7 +1687,6 @@ switch (op) {
frame.savedStackTop = stackTop;
stack[stackTop] = fun.call(cx, calleeScope, funThisObj,
getArgsArray(stack, sDbl, stackTop + 2, indexReg));
cx.lastInterpreterFrame = null;
continue Loop;
}

48
mozilla/js/rhino/testsrc/org/mozilla/javascript/tests/StackTraceTest.java Normal file
View File

@ -0,0 +1,48 @@
/**
*
*/
package org.mozilla.javascript.tests;
import junit.framework.TestCase;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextAction;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.Scriptable;
/**
* @author Marc Guillemot
*/
public class StackTraceTest extends TestCase {
/**
* As of CVS head on May, 11. 2009, stacktrace information is lost when a call to some
* native function has been made.
*/
public void testFailureStackTrace() {
final String source1 = "function f2() { throw 'hello'; }; f2();";
final String source2 = "function f2() { 'H'.toLowerCase(); throw 'hello'; }; f2();";
runWithExpectedStackTrace(source1, " at test.js (f2)\n\tat test.js\n"); // works
runWithExpectedStackTrace(source2, " at test.js (f2)\n\tat test.js\n"); // fails
}
private void runWithExpectedStackTrace(final String _source, final String _expectedStackTrace)
{
final ContextAction action = new ContextAction() {
public Object run(Context cx) {
final Scriptable scope = cx.initStandardObjects();
try {
cx.evaluateString(scope, _source, "test.js", 0, null);
}
catch (final JavaScriptException e)
{
assertEquals(_expectedStackTrace, e.getScriptStackTrace());
return null;
}
throw new RuntimeException("Exception expected!");
}
};
Utils.runWithOptimizationLevel(action, -1);
}
}