infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-09 18:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8017950: error.stack should be a string rather than an array

Browse Source 
Reviewed-by: hannesw, jlaskey
This commit is contained in:
Athijegannathan Sundararajan 2013-06-26 16:36:13 +05:30
parent 249d0ae5b4
commit f4695eca85
9 changed files with 126 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
nashorn/src/jdk/nashorn/internal/objects/NativeError.java
View File

@ -143,6 +143,30 @@ public final class NativeError extends ScriptObject {
return ECMAException.printStackTrace((ScriptObject)self);
}
/**
* Nashorn extension: Error.prototype.getStackTrace()
* "stack" property is an array typed value containing {@link StackTraceElement}
* objects of JavaScript stack frames.
*
* @param self self reference
*
* @return stack trace as a script array.
*/
@Function(attributes = Attribute.NOT_ENUMERABLE)
public static Object getStackTrace(final Object self) {
Global.checkObject(self);
final ScriptObject sobj = (ScriptObject)self;
final Object exception = ECMAException.getException(sobj);
Object[] res;
if (exception instanceof Throwable) {
res = getScriptFrames((Throwable)exception);
} else {
res = ScriptRuntime.EMPTY_ARRAY;
}
return new NativeArray(res);
}
/**
* Nashorn extension: Error.prototype.lineNumber
*
@ -229,8 +253,8 @@ public final class NativeError extends ScriptObject {
/**
* Nashorn extension: Error.prototype.stack
* "stack" property is an array typed value containing {@link StackTraceElement}
* objects of JavaScript stack frames.
* "stack" property is a string typed value containing JavaScript stack frames.
* Each frame information is separated bv "\n" character.
*
* @param self self reference
*
@ -244,27 +268,28 @@ public final class NativeError extends ScriptObject {
}
final Object exception = ECMAException.getException(sobj);
Object[] res;
final StringBuilder buf = new StringBuilder();
if (exception instanceof Throwable) {
final StackTraceElement[] frames = ((Throwable)exception).getStackTrace();
final List<StackTraceElement> filtered = new ArrayList<>();
for (final StackTraceElement st : frames) {
if (ECMAErrors.isScriptFrame(st)) {
final String className = "<" + st.getFileName() + ">";
String methodName = st.getMethodName();
if (methodName.equals(CompilerConstants.RUN_SCRIPT.symbolName())) {
methodName = "<program>";
}
filtered.add(new StackTraceElement(className, methodName,
st.getFileName(), st.getLineNumber()));
}
final Object[] frames = getScriptFrames((Throwable)exception);
for (final Object fr : frames) {
final StackTraceElement st = (StackTraceElement)fr;
buf.append(st.getMethodName());
buf.append(" @ ");
buf.append(st.getFileName());
buf.append(':');
buf.append(st.getLineNumber());
buf.append('\n');
}
res = filtered.toArray();
final int len = buf.length();
// remove trailing '\n'
if (len > 0) {
assert buf.charAt(len - 1) == '\n';
buf.deleteCharAt(len - 1);
}
return buf.toString();
} else {
res = ScriptRuntime.EMPTY_ARRAY;
return "";
}
return new NativeArray(res);
}
/**
@ -335,4 +360,21 @@ public final class NativeError extends ScriptObject {
throw new MethodHandleFactory.LookupException(e);
}
}
private static Object[] getScriptFrames(final Throwable exception) {
final StackTraceElement[] frames = ((Throwable)exception).getStackTrace();
final List<StackTraceElement> filtered = new ArrayList<>();
for (final StackTraceElement st : frames) {
if (ECMAErrors.isScriptFrame(st)) {
final String className = "<" + st.getFileName() + ">";
String methodName = st.getMethodName();
if (methodName.equals(CompilerConstants.RUN_SCRIPT.symbolName())) {
methodName = "<program>";
}
filtered.add(new StackTraceElement(className, methodName,
st.getFileName(), st.getLineNumber()));
}
}
return filtered.toArray();
}
}

2
nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
View File

@ -51,7 +51,7 @@ public final class ECMAException extends NashornException {
/** Field handle to the{@link ECMAException#thrown} field, so that it can be accessed from generated code */
public static final FieldAccess THROWN = virtualField(ECMAException.class, "thrown", Object.class);
private static final String EXCEPTION_PROPERTY = "nashornException";
public static final String EXCEPTION_PROPERTY = "nashornException";
/** Object thrown. */
public final Object thrown;

5
nashorn/test/script/basic/JDK-8012164.js
View File

@ -37,8 +37,9 @@ function error() {
try {
throw new Error('foo');
} catch (e) {
for (i in e.stack) {
printFrame(e.stack[i]);
var frames = e.getStackTrace();
for (i in frames) {
printFrame(frames[i]);
}
}
}

2
nashorn/test/script/basic/JDK-8012164.js.EXPECTED
View File

@ -1,3 +1,3 @@
<test/script/basic/JDK-8012164.js>.error(test/script/basic/JDK-8012164.js:38)
<test/script/basic/JDK-8012164.js>.func(test/script/basic/JDK-8012164.js:33)
<test/script/basic/JDK-8012164.js>.<program>(test/script/basic/JDK-8012164.js:46)
<test/script/basic/JDK-8012164.js>.<program>(test/script/basic/JDK-8012164.js:47)

47
nashorn/test/script/basic/JDK-8017950.js Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* JDK-8017950: error.stack should be a string rather than an array
*
* @test
* @run
*/
function func() {
try {
throw new Error();
} catch (e){
print(e.stack.replace(/\\/g, '/'))
}
}
function f() {
func()
}
function g() {
f()
}
g()

4
nashorn/test/script/basic/JDK-8017950.js.EXPECTED Normal file
View File

@ -0,0 +1,4 @@
func @ test/script/basic/JDK-8017950.js:33
f @ test/script/basic/JDK-8017950.js:40
g @ test/script/basic/JDK-8017950.js:44
<program> @ test/script/basic/JDK-8017950.js:47

5
nashorn/test/script/basic/NASHORN-109.js
View File

@ -33,8 +33,9 @@ try {
throw new Error("error");
}
} catch (e) {
for (i in e.stack) {
print(e.stack[i].methodName + ' ' + e.stack[i].lineNumber);
var frames = e.getStackTrace();
for (i in frames) {
print(frames[i].methodName + ' ' + frames[i].lineNumber);
}
}

4
nashorn/test/script/basic/NASHORN-296.js
View File

@ -33,7 +33,7 @@ function test(name) {
load({ script: 'throw new Error()', name: name });
} catch(e) {
// normalize windows path separator to URL style
var actual = e.stack[0].fileName;
var actual = e.getStackTrace()[0].fileName;
if (actual !== name) {
fail("expected file name to be " + name +
", actually got file name " + actual);
@ -48,6 +48,6 @@ test("com/oracle/node/sample.js");
try {
throw new Error();
} catch (e) {
test(e.stack[0].fileName.substring(6));
test(e.getStackTrace()[0].fileName.substring(6));
}

8
nashorn/test/script/basic/errorstack.js
View File

@ -22,7 +22,7 @@
*/
/**
* "stack" property of Error objects. (nashorn extension).
* "getStackTrace()" method of Error objects. (nashorn extension).
*
* @test
* @run
@ -43,9 +43,9 @@ function func3() {
try {
func1();
} catch (e) {
// "stack" is java.lang.StackTraceElement object
for (i in e.stack) {
print(e.stack[i].methodName + " : " + e.stack[i].lineNumber);
var frames = e.getStackTrace();
for (i in frames) {
print(frames[i].methodName + " : " + frames[i].lineNumber);
}
}