Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
0052ef97
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,发现更多精彩内容 >>
提交
0052ef97
编写于
12月 09, 2013
作者:
A
attila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8029467: Widening of booleans causes bad results
Reviewed-by: jlaskey, lagergren
上级
48041c86
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
2 deletion
+60
-2
src/jdk/nashorn/internal/codegen/Attr.java
src/jdk/nashorn/internal/codegen/Attr.java
+22
-2
test/script/basic/JDK-8029467.js
test/script/basic/JDK-8029467.js
+34
-0
test/script/basic/JDK-8029467.js.EXPECTED
test/script/basic/JDK-8029467.js.EXPECTED
+4
-0
未找到文件。
src/jdk/nashorn/internal/codegen/Attr.java
浏览文件 @
0052ef97
...
...
@@ -766,7 +766,7 @@ final class Attr extends NodeOperatorVisitor<LexicalContext> {
symbol
.
setType
(
Type
.
OBJECT
);
}
returnType
=
Type
.
widest
(
returnTypes
.
pop
(),
symbol
.
getSymbolType
());
returnType
=
widestReturnType
(
returnTypes
.
pop
(),
symbol
.
getSymbolType
());
}
else
{
returnType
=
Type
.
OBJECT
;
//undefined
}
...
...
@@ -1433,10 +1433,30 @@ final class Attr extends NodeOperatorVisitor<LexicalContext> {
ensureTypeNotUnknown
(
trueExpr
);
ensureTypeNotUnknown
(
falseExpr
);
final
Type
type
=
Type
.
widest
(
trueExpr
.
getType
(),
falseExpr
.
getType
());
final
Type
type
=
widestReturnType
(
trueExpr
.
getType
(),
falseExpr
.
getType
());
return
end
(
ensureSymbol
(
type
,
ternaryNode
));
}
/**
* When doing widening for return types of a function or a ternary operator, it is not valid to widen a boolean to
* anything other than Object. Also, widening a numeric type to an object type must widen to Object proper and not
* any more specific subclass (e.g. widest of int/long/double and String is Object).
* @param t1 type 1
* @param t2 type 2
* @return wider of t1 and t2, except if one is boolean and the other is neither boolean nor unknown, or if one is
* numeric and the other is neither numeric nor unknown in which case {@code Type.OBJECT} is returned.
*/
private
static
Type
widestReturnType
(
final
Type
t1
,
final
Type
t2
)
{
if
(
t1
.
isUnknown
())
{
return
t2
;
}
else
if
(
t2
.
isUnknown
())
{
return
t1
;
}
else
if
(
t1
.
isBoolean
()
!=
t2
.
isBoolean
()
||
t1
.
isNumeric
()
!=
t2
.
isNumeric
())
{
return
Type
.
OBJECT
;
}
return
Type
.
widest
(
t1
,
t2
);
}
private
void
initCompileConstant
(
final
CompilerConstants
cc
,
final
Block
block
,
final
int
flags
)
{
final
Class
<?>
type
=
cc
.
type
();
// Must not call this method for constants with no explicit types; use the one with (..., Type) signature instead.
...
...
test/script/basic/JDK-8029467.js
0 → 100644
浏览文件 @
0052ef97
/*
* 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-8029467: Widening of booleans causes bad results
*
* @test
* @run
*/
print
((
function
(
x
)
{
return
x
?
true
:
0
})(
true
))
print
((
function
(
x
)
{
if
(
x
)
{
return
true
}
else
{
return
0
}
})(
true
))
print
(
typeof
(
function
(
x
)
{
return
x
?
1
:
"
123
"
})(
true
)
===
"
number
"
)
print
(
typeof
(
function
(
x
)
{
if
(
x
)
{
return
1
}
else
{
return
"
123
"
}
})(
true
)
===
"
number
"
)
test/script/basic/JDK-8029467.js.EXPECTED
0 → 100644
浏览文件 @
0052ef97
true
true
true
true
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录