Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f5900f48
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f5900f48
编写于
1月 28, 2014
作者:
R
rfield
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8032711: Issue with Lambda in handling
8032704: Issues with lib perm in Lambda Reviewed-by: jrose, ahgross, briangoetz
上级
d4725ae6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
135 addition
and
0 deletion
+135
-0
src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
...java/lang/invoke/AbstractValidatingLambdaMetafactory.java
+11
-0
test/java/lang/invoke/lambda/T8032704.java
test/java/lang/invoke/lambda/T8032704.java
+62
-0
test/java/lang/invoke/lambda/T8032711.java
test/java/lang/invoke/lambda/T8032711.java
+62
-0
未找到文件。
src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
浏览文件 @
f5900f48
...
@@ -114,6 +114,11 @@ import static sun.invoke.util.Wrapper.isWrapperType;
...
@@ -114,6 +114,11 @@ import static sun.invoke.util.Wrapper.isWrapperType;
Class
<?>[]
markerInterfaces
,
Class
<?>[]
markerInterfaces
,
MethodType
[]
additionalBridges
)
MethodType
[]
additionalBridges
)
throws
LambdaConversionException
{
throws
LambdaConversionException
{
if
((
caller
.
lookupModes
()
&
MethodHandles
.
Lookup
.
PRIVATE
)
==
0
)
{
throw
new
LambdaConversionException
(
String
.
format
(
"Invalid caller: %s"
,
caller
.
lookupClass
().
getName
()));
}
this
.
targetClass
=
caller
.
lookupClass
();
this
.
targetClass
=
caller
.
lookupClass
();
this
.
invokedType
=
invokedType
;
this
.
invokedType
=
invokedType
;
...
@@ -256,11 +261,17 @@ import static sun.invoke.util.Wrapper.isWrapperType;
...
@@ -256,11 +261,17 @@ import static sun.invoke.util.Wrapper.isWrapperType;
(
implKind
==
MethodHandleInfo
.
REF_newInvokeSpecial
)
(
implKind
==
MethodHandleInfo
.
REF_newInvokeSpecial
)
?
implDefiningClass
?
implDefiningClass
:
implMethodType
.
returnType
();
:
implMethodType
.
returnType
();
Class
<?>
samReturnType
=
samMethodType
.
returnType
();
if
(!
isAdaptableToAsReturn
(
actualReturnType
,
expectedType
))
{
if
(!
isAdaptableToAsReturn
(
actualReturnType
,
expectedType
))
{
throw
new
LambdaConversionException
(
throw
new
LambdaConversionException
(
String
.
format
(
"Type mismatch for lambda return: %s is not convertible to %s"
,
String
.
format
(
"Type mismatch for lambda return: %s is not convertible to %s"
,
actualReturnType
,
expectedType
));
actualReturnType
,
expectedType
));
}
}
if
(!
isAdaptableToAsReturn
(
expectedType
,
samReturnType
))
{
throw
new
LambdaConversionException
(
String
.
format
(
"Type mismatch for lambda expected return: %s is not convertible to %s"
,
expectedType
,
samReturnType
));
}
}
}
/**
/**
...
...
test/java/lang/invoke/lambda/T8032704.java
0 → 100644
浏览文件 @
f5900f48
/*
* Copyright (c) 2014, 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 8032704
* @summary Issues with lib perm in Lambda
*/
import
java.io.Closeable
;
import
java.lang.invoke.LambdaMetafactory
;
import
java.lang.invoke.LambdaConversionException
;
import
java.lang.invoke.MethodHandle
;
import
java.lang.invoke.MethodHandles
;
import
java.lang.invoke.MethodType
;
public
class
T8032704
{
public
static
void
here
()
{}
static
MethodHandle
h
;
private
static
MethodType
mt
(
Class
<?>
k
)
{
return
MethodType
.
methodType
(
k
);
}
private
static
boolean
mf
(
MethodHandles
.
Lookup
l
)
{
try
{
LambdaMetafactory
.
metafactory
(
l
,
"close"
,
mt
(
Closeable
.
class
),
mt
(
void
.
class
),
h
,
mt
(
void
.
class
));
}
catch
(
LambdaConversionException
e
)
{
return
true
;
}
return
false
;
}
public
static
void
main
(
String
[]
args
)
throws
Throwable
{
MethodHandles
.
Lookup
ll
=
MethodHandles
.
lookup
();
h
=
ll
.
findStatic
(
T8032704
.
class
,
"here"
,
mt
(
void
.
class
));
if
(
mf
(
ll
))
throw
new
AssertionError
(
"Error: Should work"
);
if
(!
mf
(
MethodHandles
.
publicLookup
()))
throw
new
AssertionError
(
"Error: Should fail - public"
);
if
(!
mf
(
ll
.
in
(
T8032704other
.
class
)))
throw
new
AssertionError
(
"Error: Should fail - other"
);
if
(!
mf
(
ll
.
in
(
Thread
.
class
)))
throw
new
AssertionError
(
"Error: Should fail - Thread"
);
}
}
class
T8032704other
{}
test/java/lang/invoke/lambda/T8032711.java
0 → 100644
浏览文件 @
f5900f48
/*
* Copyright (c) 2014, 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 8032711
* @summary Issue with Lambda in handling
*/
import
java.lang.invoke.LambdaMetafactory
;
import
java.lang.invoke.LambdaConversionException
;
import
java.lang.invoke.MethodHandle
;
import
java.lang.invoke.MethodHandles
;
import
java.lang.invoke.MethodType
;
public
class
T8032711
{
interface
I
{
void
m
();
}
static
void
here
()
{}
static
MethodHandles
.
Lookup
l
;
static
MethodHandle
h
;
private
static
MethodType
mt
(
Class
<?>
k
)
{
return
MethodType
.
methodType
(
k
);
}
private
static
boolean
mf
(
Class
<?>
k
)
{
try
{
LambdaMetafactory
.
metafactory
(
l
,
"m"
,
mt
(
I
.
class
),
mt
(
k
),
h
,
mt
(
void
.
class
));
}
catch
(
LambdaConversionException
e
)
{
return
true
;
}
return
false
;
}
public
static
void
main
(
String
[]
args
)
throws
Throwable
{
l
=
MethodHandles
.
lookup
();
h
=
l
.
findStatic
(
T8032711
.
class
,
"here"
,
mt
(
void
.
class
));
if
(
mf
(
void
.
class
))
throw
new
AssertionError
(
"Error: Should work"
);
if
(!
mf
(
String
.
class
))
throw
new
AssertionError
(
"Error: Should fail"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录