Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
c5a32e42
D
dragonwell8_nashorn
项目概览
openanolis
/
dragonwell8_nashorn
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_nashorn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c5a32e42
编写于
5月 31, 2013
作者:
S
sundar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8012164: Error.stack needs trimming
Reviewed-by: lagergren, jlaskey
上级
e416912d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
61 addition
and
5 deletion
+61
-5
src/jdk/nashorn/internal/objects/NativeError.java
src/jdk/nashorn/internal/objects/NativeError.java
+8
-1
test/script/basic/JDK-8012164.js
test/script/basic/JDK-8012164.js
+46
-0
test/script/basic/JDK-8012164.js.EXPECTED
test/script/basic/JDK-8012164.js.EXPECTED
+3
-0
test/script/basic/NASHORN-108.js.EXPECTED
test/script/basic/NASHORN-108.js.EXPECTED
+2
-2
test/script/basic/NASHORN-109.js.EXPECTED
test/script/basic/NASHORN-109.js.EXPECTED
+1
-1
test/script/basic/errorstack.js.EXPECTED
test/script/basic/errorstack.js.EXPECTED
+1
-1
未找到文件。
src/jdk/nashorn/internal/objects/NativeError.java
浏览文件 @
c5a32e42
...
...
@@ -32,6 +32,7 @@ import java.lang.invoke.MethodHandle;
import
java.lang.invoke.MethodHandles
;
import
java.util.ArrayList
;
import
java.util.List
;
import
jdk.nashorn.internal.codegen.CompilerConstants
;
import
jdk.nashorn.internal.objects.annotations.Attribute
;
import
jdk.nashorn.internal.objects.annotations.Constructor
;
import
jdk.nashorn.internal.objects.annotations.Function
;
...
...
@@ -248,7 +249,13 @@ public final class NativeError extends ScriptObject {
final
List
<
StackTraceElement
>
filtered
=
new
ArrayList
<>();
for
(
final
StackTraceElement
st
:
frames
)
{
if
(
ECMAErrors
.
isScriptFrame
(
st
))
{
filtered
.
add
(
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
()));
}
}
res
=
filtered
.
toArray
();
...
...
test/script/basic/JDK-8012164.js
0 → 100644
浏览文件 @
c5a32e42
/*
* 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-8012164: Error.stack needs trimming
*
* @test
* @run
*/
function
func
()
{
error
();
}
function
error
()
{
try
{
throw
new
Error
(
'
foo
'
);
}
catch
(
e
)
{
for
(
i
in
e
.
stack
)
{
print
(
e
.
stack
[
i
]);
}
}
}
func
();
test/script/basic/JDK-8012164.js.EXPECTED
0 → 100644
浏览文件 @
c5a32e42
<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/NASHORN-108.js.EXPECTED
浏览文件 @
c5a32e42
runScript
33
runScript
32
<program>
33
<program>
32
done
test/script/basic/NASHORN-109.js.EXPECTED
浏览文件 @
c5a32e42
runScript
33
<program>
33
done
test/script/basic/errorstack.js.EXPECTED
浏览文件 @
c5a32e42
func3 : 40
func2 : 36
func1 : 32
runScript
: 44
<program>
: 44
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录