Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
ee553626
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ee553626
编写于
1月 03, 2017
作者:
D
dlsmith
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8144066: StackOverflowException when computing glb
Reviewed-by: mcimadamore
上级
6baf9960
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
95 addition
and
5 deletion
+95
-5
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
...ompiler/share/classes/com/sun/tools/javac/code/Types.java
+11
-5
langtools/test/tools/javac/generics/inference/CaptureGLB1.java
...ools/test/tools/javac/generics/inference/CaptureGLB1.java
+42
-0
langtools/test/tools/javac/generics/inference/CaptureGLB2.java
...ools/test/tools/javac/generics/inference/CaptureGLB2.java
+42
-0
未找到文件。
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
浏览文件 @
ee553626
...
...
@@ -3845,20 +3845,26 @@ public class Types {
return
bounds
.
head
;
}
else
{
// length > 1
int
classCount
=
0
;
List
<
Type
>
cvars
=
List
.
nil
();
List
<
Type
>
lowers
=
List
.
nil
();
for
(
Type
bound
:
bounds
)
{
if
(!
bound
.
isInterface
())
{
classCount
++;
Type
lower
=
cvarLowerBound
(
bound
);
if
(
bound
!=
lower
&&
!
lower
.
hasTag
(
BOT
))
lowers
=
insert
(
lowers
,
lower
);
if
(
bound
!=
lower
&&
!
lower
.
hasTag
(
BOT
))
{
cvars
=
cvars
.
append
(
bound
);
lowers
=
lowers
.
append
(
lower
);
}
}
}
if
(
classCount
>
1
)
{
if
(
lowers
.
isEmpty
())
if
(
lowers
.
isEmpty
())
{
return
createErrorType
(
errT
);
else
return
glbFlattened
(
union
(
bounds
,
lowers
),
errT
);
}
else
{
// try again with lower bounds included instead of capture variables
List
<
Type
>
newBounds
=
bounds
.
diff
(
cvars
).
appendList
(
lowers
);
return
glb
(
newBounds
);
}
}
}
return
makeIntersectionType
(
bounds
);
...
...
langtools/test/tools/javac/generics/inference/CaptureGLB1.java
0 → 100644
浏览文件 @
ee553626
/*
* Copyright (c) 2016, 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.
*/
/*
* @test
* @bug 8144066
* @summary GLB of two lower-bounded capture variables, bounded by related array types
* @compile CaptureGLB1.java
*/
public
class
CaptureGLB1
{
interface
A
<
T
>
{
}
Exception
[]
bar
(
A
<?
super
Exception
[]>
x
,
A
<?
super
Throwable
[]>
y
){
return
foo
(
x
,
y
);
}
<
T
>
T
foo
(
A
<?
super
T
>
x
,
A
<?
super
T
>
y
){
return
null
;
}
}
langtools/test/tools/javac/generics/inference/CaptureGLB2.java
0 → 100644
浏览文件 @
ee553626
/*
* Copyright (c) 2016, 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.
*/
/*
* @test
* @bug 8144066
* @summary GLB of two lower-bounded capture variables, bounded by related wildcard-parameterized types
* @compile CaptureGLB2.java
*/
public
class
CaptureGLB2
{
interface
A
<
T
>
{
}
Class
<?>
bar
(
A
<?
super
Class
<?
extends
Exception
>>
x
,
A
<?
super
Class
<?
extends
Throwable
>>
y
){
return
foo
(
x
,
y
);
}
<
T
>
T
foo
(
A
<?
super
T
>
x
,
A
<?
super
T
>
y
){
return
null
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录