Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
cd8941d5
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,发现更多精彩内容 >>
提交
cd8941d5
编写于
5月 23, 2013
作者:
L
lagergren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8012083: Array literal constant folding issue
Reviewed-by: attila, jlaskey
上级
59ed3a0a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
100 addition
and
2 deletion
+100
-2
src/jdk/nashorn/internal/codegen/CodeGenerator.java
src/jdk/nashorn/internal/codegen/CodeGenerator.java
+1
-1
src/jdk/nashorn/internal/codegen/FinalizeTypes.java
src/jdk/nashorn/internal/codegen/FinalizeTypes.java
+1
-1
src/jdk/nashorn/internal/codegen/FoldConstants.java
src/jdk/nashorn/internal/codegen/FoldConstants.java
+9
-0
test/script/basic/JDK-8012083.js
test/script/basic/JDK-8012083.js
+70
-0
test/script/basic/JDK-8012083.js.EXPECTED
test/script/basic/JDK-8012083.js.EXPECTED
+19
-0
未找到文件。
src/jdk/nashorn/internal/codegen/CodeGenerator.java
浏览文件 @
cd8941d5
...
...
@@ -2295,7 +2295,7 @@ final class CodeGenerator extends NodeOperatorVisitor {
@Override
public
boolean
enterADD
(
final
UnaryNode
unaryNode
)
{
load
(
unaryNode
.
rhs
());
assert
unaryNode
.
rhs
().
getType
().
isNumber
();
assert
unaryNode
.
rhs
().
getType
().
isNumber
()
:
unaryNode
.
rhs
().
getType
()
+
" "
+
unaryNode
.
getSymbol
()
;
method
.
store
(
unaryNode
.
getSymbol
());
return
false
;
...
...
src/jdk/nashorn/internal/codegen/FinalizeTypes.java
浏览文件 @
cd8941d5
...
...
@@ -800,7 +800,7 @@ final class FinalizeTypes extends NodeOperatorVisitor {
Node
resultNode
=
node
;
if
(
node
instanceof
LiteralNode
&&
!
to
.
isObject
())
{
if
(
node
instanceof
LiteralNode
&&
!
(
node
instanceof
ArrayLiteralNode
)
&&
!
to
.
isObject
())
{
final
LiteralNode
<?>
newNode
=
new
LiteralNodeConstantEvaluator
((
LiteralNode
<?>)
node
,
to
).
eval
();
if
(
newNode
!=
null
)
{
resultNode
=
newNode
;
...
...
src/jdk/nashorn/internal/codegen/FoldConstants.java
浏览文件 @
cd8941d5
...
...
@@ -34,6 +34,7 @@ import jdk.nashorn.internal.ir.FunctionNode;
import
jdk.nashorn.internal.ir.FunctionNode.CompilationState
;
import
jdk.nashorn.internal.ir.IfNode
;
import
jdk.nashorn.internal.ir.LiteralNode
;
import
jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode
;
import
jdk.nashorn.internal.ir.Node
;
import
jdk.nashorn.internal.ir.TernaryNode
;
import
jdk.nashorn.internal.ir.UnaryNode
;
...
...
@@ -141,6 +142,10 @@ final class FoldConstants extends NodeVisitor {
return
null
;
}
if
(
rhsNode
instanceof
ArrayLiteralNode
)
{
return
null
;
}
final
LiteralNode
<?>
rhs
=
(
LiteralNode
<?>)
rhsNode
;
final
boolean
rhsInteger
=
rhs
.
getType
().
isInteger
();
...
...
@@ -212,6 +217,10 @@ final class FoldConstants extends NodeVisitor {
final
LiteralNode
<?>
lhs
=
(
LiteralNode
<?>)
parent
.
lhs
();
final
LiteralNode
<?>
rhs
=
(
LiteralNode
<?>)
parent
.
rhs
();
if
(
lhs
instanceof
ArrayLiteralNode
||
rhs
instanceof
ArrayLiteralNode
)
{
return
null
;
}
final
Type
widest
=
Type
.
widest
(
lhs
.
getType
(),
rhs
.
getType
());
boolean
isInteger
=
widest
.
isInteger
();
...
...
test/script/basic/JDK-8012083.js
0 → 100644
浏览文件 @
cd8941d5
/*
* 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-8012093 - array literals can only be subject to constant evaluation under very special
* circumstances.
*
* @test
* @run
*/
var
w00t
=
17
;
print
(
+
[
w00t
]);
var
empty
=
[];
print
(
empty
==
false
);
print
([]
==
false
);
print
([]
===
false
);
print
(
!!
[]);
print
(
~
[]);
print
(
!
[]);
print
(
!
[
17
]);
print
(
!
[
17
,
1
,
2
]);
var
one
=
1
;
var
two
=
2
;
var
a1
=
[
one
];
var
a2
=
[
two
];
print
(
+
a1
+
+
a2
);
//3
var
x
=
1
;
print
(
+
[
"
apa
"
]);
print
(
+
[]);
//0
print
(
+
[
1
]);
//1
print
(
+
[
x
]);
//1
print
(
+
[
1
,
2
,
3
]);
//NaN
var
a
=
[];
var
b
=
[
1
];
print
(
a
/
b
);
print
(
++
[[]][
+
[]]
+
[
+
[]]);
//10
print
(
+
[]
==
0
);
var
first
=
[
!
[]
+
[]][
+
[]][
+
[]]
+
[
!
[]
+
[]][
+
[]][
+!+
[]]
+
[
!+
[]
+
[]][
+!
[]][
+!
[]]
+
[
!
[]
+
[]][
+
[]][
+!+
[]]
+
[
!
[]
+
[]][
+
[]][
+!+
[]
+!+
[]];
var
second
=
(
!
[]
+
[])[
+
[]]
+
(
!
[]
+
[])[
+!+
[]]
+
([
!
[]]
+
[][[]])[
+!+
[]
+
[
+
[]]]
+
(
!
[]
+
[])[
!+
[]
+!+
[]];
print
(
first
+
"
"
+
second
);
test/script/basic/JDK-8012083.js.EXPECTED
0 → 100644
浏览文件 @
cd8941d5
17
true
true
false
true
-1
false
false
false
3
NaN
0
1
1
NaN
0
10
true
fatal fail
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录