Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
7261a265
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7261a265
编写于
8月 22, 2013
作者:
V
vromero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8023112: javac should not use lazy constant evaluation approach for method references
Reviewed-by: jjg, mcimadamore
上级
94c7cff1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
113 addition
and
5 deletion
+113
-5
src/share/classes/com/sun/tools/javac/comp/Attr.java
src/share/classes/com/sun/tools/javac/comp/Attr.java
+1
-3
src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+54
-2
test/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java
...ac/T8023112/SkipLazyConstantCreationForMethodRefTest.java
+58
-0
未找到文件。
src/share/classes/com/sun/tools/javac/comp/Attr.java
浏览文件 @
7261a265
...
@@ -1063,9 +1063,7 @@ public class Attr extends JCTree.Visitor {
...
@@ -1063,9 +1063,7 @@ public class Attr extends JCTree.Visitor {
if
(
tree
.
init
!=
null
)
{
if
(
tree
.
init
!=
null
)
{
if
((
v
.
flags_field
&
FINAL
)
!=
0
&&
if
((
v
.
flags_field
&
FINAL
)
!=
0
&&
!
tree
.
init
.
hasTag
(
NEWCLASS
)
&&
memberEnter
.
needsLazyConstValue
(
tree
.
init
))
{
!
tree
.
init
.
hasTag
(
LAMBDA
)
&&
!
tree
.
init
.
hasTag
(
REFERENCE
))
{
// In this case, `v' is final. Ensure that it's initializer is
// In this case, `v' is final. Ensure that it's initializer is
// evaluated.
// evaluated.
v
.
getConstValue
();
// ensure initializer is evaluated
v
.
getConstValue
();
// ensure initializer is evaluated
...
...
src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
浏览文件 @
7261a265
...
@@ -677,8 +677,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
...
@@ -677,8 +677,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
if
(
tree
.
init
!=
null
)
{
if
(
tree
.
init
!=
null
)
{
v
.
flags_field
|=
HASINIT
;
v
.
flags_field
|=
HASINIT
;
if
((
v
.
flags_field
&
FINAL
)
!=
0
&&
if
((
v
.
flags_field
&
FINAL
)
!=
0
&&
!
tree
.
init
.
hasTag
(
NEWCLASS
)
&&
needsLazyConstValue
(
tree
.
init
))
{
!
tree
.
init
.
hasTag
(
LAMBDA
))
{
Env
<
AttrContext
>
initEnv
=
getInitEnv
(
tree
,
env
);
Env
<
AttrContext
>
initEnv
=
getInitEnv
(
tree
,
env
);
initEnv
.
info
.
enclVar
=
v
;
initEnv
.
info
.
enclVar
=
v
;
v
.
setLazyConstValue
(
initEnv
(
tree
,
initEnv
),
attr
,
tree
.
init
);
v
.
setLazyConstValue
(
initEnv
(
tree
,
initEnv
),
attr
,
tree
.
init
);
...
@@ -700,6 +699,59 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
...
@@ -700,6 +699,59 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
}
}
}
}
public
boolean
needsLazyConstValue
(
JCTree
tree
)
{
InitTreeVisitor
initTreeVisitor
=
new
InitTreeVisitor
();
tree
.
accept
(
initTreeVisitor
);
return
initTreeVisitor
.
result
;
}
/** Visitor class for expressions which might be constant expressions.
*/
static
class
InitTreeVisitor
extends
JCTree
.
Visitor
{
private
boolean
result
=
true
;
@Override
public
void
visitTree
(
JCTree
tree
)
{}
@Override
public
void
visitNewClass
(
JCNewClass
that
)
{
result
=
false
;
}
@Override
public
void
visitLambda
(
JCLambda
that
)
{
result
=
false
;
}
@Override
public
void
visitReference
(
JCMemberReference
that
)
{
result
=
false
;
}
@Override
public
void
visitSelect
(
JCFieldAccess
tree
)
{
tree
.
selected
.
accept
(
this
);
}
@Override
public
void
visitConditional
(
JCConditional
tree
)
{
tree
.
cond
.
accept
(
this
);
tree
.
truepart
.
accept
(
this
);
tree
.
falsepart
.
accept
(
this
);
}
@Override
public
void
visitParens
(
JCParens
tree
)
{
tree
.
expr
.
accept
(
this
);
}
@Override
public
void
visitTypeCast
(
JCTypeCast
tree
)
{
tree
.
expr
.
accept
(
this
);
}
}
/** Create a fresh environment for a variable's initializer.
/** Create a fresh environment for a variable's initializer.
* If the variable is a field, the owner of the environment's scope
* If the variable is a field, the owner of the environment's scope
* is be the variable itself, otherwise the owner is the method
* is be the variable itself, otherwise the owner is the method
...
...
test/tools/javac/T8023112/SkipLazyConstantCreationForMethodRefTest.java
0 → 100644
浏览文件 @
7261a265
/*
* Copyright (c) 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
/*
* @test
* @bug 8023112
* @summary Mixing up the method type argument with the class type for method
* reference ClassType<Q>::<T>new
* @compile SkipLazyConstantCreationForMethodRefTest.java
*/
public
class
SkipLazyConstantCreationForMethodRefTest
<
T
>
{
SkipLazyConstantCreationForMethodRefTest
(
int
a
,
boolean
b
)
{}
SkipLazyConstantCreationForMethodRefTest
()
{}
}
class
SubClass
<
T
>
extends
SkipLazyConstantCreationForMethodRefTest
{
SubClass
(
int
a
,
boolean
b
)
{}
}
interface
SAM
{
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>
m
(
int
a
,
boolean
b
);
}
interface
Tester1
{
SAM
s11
=
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>::<
Object
>
new
;
SAM
s12
=
(
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>::<
Object
>
new
);
SAM
s13
=
(
SAM
)
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>::<
Object
>
new
;
SAM
s14
=
true
?
s11
:
s12
;
SAM
s15
=
true
?
s11
:
(
SAM
)
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>::<
Object
>
new
;
SAM
s16
=
true
?
(
SAM
)
SubClass
<
SkipLazyConstantCreationForMethodRefTest
>::<
Object
>
new
:
s12
;
}
interface
Tester2
{
SAM
s21
=
Tester1
.
s11
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录