Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
c6da38a9
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,发现更多精彩内容 >>
提交
c6da38a9
编写于
9月 25, 2015
作者:
A
attila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8134490: Dead var statement evacuation incorrectly descends into nested functions
Reviewed-by: hannesw, mhaupt
上级
065eed9f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
55 addition
and
9 deletion
+55
-9
src/jdk/nashorn/internal/codegen/FindScopeDepths.java
src/jdk/nashorn/internal/codegen/FindScopeDepths.java
+5
-9
src/jdk/nashorn/internal/codegen/Lower.java
src/jdk/nashorn/internal/codegen/Lower.java
+9
-0
test/script/basic/JDK-8134490.js
test/script/basic/JDK-8134490.js
+41
-0
未找到文件。
src/jdk/nashorn/internal/codegen/FindScopeDepths.java
浏览文件 @
c6da38a9
...
@@ -277,15 +277,11 @@ final class FindScopeDepths extends NodeVisitor<LexicalContext> implements Logga
...
@@ -277,15 +277,11 @@ final class FindScopeDepths extends NodeVisitor<LexicalContext> implements Logga
final
Set
<
Symbol
>
symbols
=
new
HashSet
<>();
final
Set
<
Symbol
>
symbols
=
new
HashSet
<>();
block
.
accept
(
new
NodeVisitor
<
LexicalContext
>(
new
LexicalContext
())
{
block
.
accept
(
new
NodeVisitor
<
LexicalContext
>(
new
LexicalContext
())
{
@Override
@Override
public
final
boolean
enterDefault
(
final
Node
node
)
{
public
boolean
enterIdentNode
(
final
IdentNode
identNode
)
{
if
(!
compiler
.
isOnDemandCompilation
())
{
final
Symbol
symbol
=
identNode
.
getSymbol
();
if
(
node
instanceof
IdentNode
)
{
if
(
symbol
!=
null
&&
symbol
.
isScope
())
{
final
Symbol
symbol
=
((
IdentNode
)
node
).
getSymbol
();
//if this is an internal symbol, skip it.
if
(
symbol
!=
null
&&
symbol
.
isScope
())
{
symbols
.
add
(
symbol
);
//if this is an internal symbol, skip it.
symbols
.
add
(
symbol
);
}
}
}
}
return
true
;
return
true
;
}
}
...
...
src/jdk/nashorn/internal/codegen/Lower.java
浏览文件 @
c6da38a9
...
@@ -123,9 +123,18 @@ final class Lower extends NodeOperatorVisitor<BlockLexicalContext> implements Lo
...
@@ -123,9 +123,18 @@ final class Lower extends NodeOperatorVisitor<BlockLexicalContext> implements Lo
statement
.
accept
(
new
NodeVisitor
<
LexicalContext
>(
new
LexicalContext
())
{
statement
.
accept
(
new
NodeVisitor
<
LexicalContext
>(
new
LexicalContext
())
{
@Override
@Override
public
boolean
enterVarNode
(
final
VarNode
varNode
)
{
public
boolean
enterVarNode
(
final
VarNode
varNode
)
{
// We can't entirely eliminate dead statements, as var declarations are scoped
// to the whole function so we need to preserve them although without
// initializers.
newStatements
.
add
(
varNode
.
setInit
(
null
));
newStatements
.
add
(
varNode
.
setInit
(
null
));
return
false
;
return
false
;
}
}
@Override
public
boolean
enterFunctionNode
(
final
FunctionNode
functionNode
)
{
// Don't descend into nested functions when searching for VarNodes, though.
return
false
;
}
});
});
}
}
}
}
...
...
test/script/basic/JDK-8134490.js
0 → 100644
浏览文件 @
c6da38a9
/*
* Copyright (c) 2015 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-8134490: Dead var statement evacuation incorrectly descends into nested functions
*
* @test
* @run
*/
var
v1
;
function
f1
()
{
v1
=
1
;
return
true
;
(
function
()
{
var
v1
;
})();
}
f1
();
// If it executes without throwing an exception in code generator, it's working.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录