Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
858f89e2
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,发现更多精彩内容 >>
提交
858f89e2
编写于
4月 23, 2013
作者:
A
attila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8011065: Problems when script implements an interface with variadic methods
Reviewed-by: jlaskey, hannesw, sundar
上级
3c64d163
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
72 addition
and
19 deletion
+72
-19
src/jdk/nashorn/internal/codegen/CodeGenerator.java
src/jdk/nashorn/internal/codegen/CodeGenerator.java
+1
-1
src/jdk/nashorn/internal/runtime/ScriptObject.java
src/jdk/nashorn/internal/runtime/ScriptObject.java
+10
-6
src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
...internal/runtime/linker/JavaAdapterBytecodeGenerator.java
+2
-4
src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
.../nashorn/internal/runtime/linker/JavaAdapterServices.java
+6
-8
test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+22
-0
test/src/jdk/nashorn/api/scripting/VariableArityTestInterface.java
...jdk/nashorn/api/scripting/VariableArityTestInterface.java
+31
-0
未找到文件。
src/jdk/nashorn/internal/codegen/CodeGenerator.java
浏览文件 @
858f89e2
...
...
@@ -664,7 +664,7 @@ final class CodeGenerator extends NodeOperatorVisitor {
final
int
useCount
=
symbol
.
getUseCount
();
// Threshold for generating shared scope callsite is lower for fast scope symbols because we know
// we can dial in the correct scope. However, we als need to enable it for non-fast scopes to
// we can dial in the correct scope. However, we als
o
need to enable it for non-fast scopes to
// support huge scripts like mandreel.js.
if
(
callNode
.
isEval
())
{
evalCall
(
node
,
flags
);
...
...
src/jdk/nashorn/internal/runtime/ScriptObject.java
浏览文件 @
858f89e2
...
...
@@ -28,6 +28,7 @@ package jdk.nashorn.internal.runtime;
import
static
jdk
.
nashorn
.
internal
.
codegen
.
CompilerConstants
.
staticCall
;
import
static
jdk
.
nashorn
.
internal
.
codegen
.
CompilerConstants
.
virtualCall
;
import
static
jdk
.
nashorn
.
internal
.
codegen
.
CompilerConstants
.
virtualCallNoLookup
;
import
static
jdk
.
nashorn
.
internal
.
lookup
.
Lookup
.
MH
;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
ECMAErrors
.
referenceError
;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
ECMAErrors
.
typeError
;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
PropertyDescriptor
.
CONFIGURABLE
;
...
...
@@ -39,7 +40,6 @@ import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
ScriptRuntime
.
UNDEFINED
;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
arrays
.
ArrayIndex
.
getArrayIndexNoThrow
;
import
static
jdk
.
nashorn
.
internal
.
runtime
.
arrays
.
ArrayIndex
.
isValidArrayIndex
;
import
static
jdk
.
nashorn
.
internal
.
lookup
.
Lookup
.
MH
;
import
java.lang.invoke.MethodHandle
;
import
java.lang.invoke.MethodHandles
;
...
...
@@ -61,12 +61,13 @@ import jdk.internal.dynalink.linker.LinkRequest;
import
jdk.internal.dynalink.support.CallSiteDescriptorFactory
;
import
jdk.nashorn.internal.codegen.CompilerConstants.Call
;
import
jdk.nashorn.internal.codegen.ObjectClassGenerator
;
import
jdk.nashorn.internal.lookup.Lookup
;
import
jdk.nashorn.internal.lookup.MethodHandleFactory
;
import
jdk.nashorn.internal.objects.AccessorPropertyDescriptor
;
import
jdk.nashorn.internal.objects.DataPropertyDescriptor
;
import
jdk.nashorn.internal.runtime.arrays.ArrayData
;
import
jdk.nashorn.internal.runtime.linker.Bootstrap
;
import
jdk.nashorn.internal.lookup.Lookup
;
import
jdk.nashorn.internal.lookup.MethodHandleFactory
;
import
jdk.nashorn.internal.runtime.linker.LinkerCallSite
;
import
jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor
;
import
jdk.nashorn.internal.runtime.linker.NashornGuards
;
...
...
@@ -2139,8 +2140,11 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
*
* Make sure arguments are paired correctly.
* @param methodHandle MethodHandle to adjust.
* @param callType MethodType of caller.
* @param callerVarArg true if the caller is vararg, false otherwise, null if it should be inferred.
* @param callType MethodType of the call site.
* @param callerVarArg true if the caller is vararg, false otherwise, null if it should be inferred from the
* {@code callType}; basically, if the last parameter type of the call site is an array, it'll be considered a
* variable arity call site. These are ordinarily rare; Nashorn code generator creates variable arity call sites
* when the call has more than {@link LinkerCallSite#ARGLIMIT} parameters.
*
* @return method handle with adjusted arguments
*/
...
...
@@ -2155,7 +2159,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
final
int
callCount
=
callType
.
parameterCount
();
final
boolean
isCalleeVarArg
=
parameterCount
>
0
&&
methodType
.
parameterType
(
parameterCount
-
1
).
isArray
();
final
boolean
isCallerVarArg
=
callerVarArg
!=
null
?
callerVarArg
.
booleanValue
()
:
(
callCount
>
1
&&
final
boolean
isCallerVarArg
=
callerVarArg
!=
null
?
callerVarArg
.
booleanValue
()
:
(
callCount
>
0
&&
callType
.
parameterType
(
callCount
-
1
).
isArray
());
if
(
callCount
<
parameterCount
)
{
...
...
src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
浏览文件 @
858f89e2
...
...
@@ -127,9 +127,9 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase {
private
static
final
Type
METHOD_TYPE_TYPE
=
Type
.
getType
(
MethodType
.
class
);
private
static
final
Type
METHOD_HANDLE_TYPE
=
Type
.
getType
(
MethodHandle
.
class
);
private
static
final
String
GET_HANDLE_OBJECT_DESCRIPTOR
=
Type
.
getMethodDescriptor
(
METHOD_HANDLE_TYPE
,
OBJECT_TYPE
,
STRING_TYPE
,
METHOD_TYPE_TYPE
,
Type
.
BOOLEAN_TYPE
);
OBJECT_TYPE
,
STRING_TYPE
,
METHOD_TYPE_TYPE
);
private
static
final
String
GET_HANDLE_FUNCTION_DESCRIPTOR
=
Type
.
getMethodDescriptor
(
METHOD_HANDLE_TYPE
,
SCRIPT_FUNCTION_TYPE
,
METHOD_TYPE_TYPE
,
Type
.
BOOLEAN_TYPE
);
SCRIPT_FUNCTION_TYPE
,
METHOD_TYPE_TYPE
);
private
static
final
String
GET_CLASS_INITIALIZER_DESCRIPTOR
=
Type
.
getMethodDescriptor
(
SCRIPT_OBJECT_TYPE
);
private
static
final
Type
RUNTIME_EXCEPTION_TYPE
=
Type
.
getType
(
RuntimeException
.
class
);
private
static
final
Type
THROWABLE_TYPE
=
Type
.
getType
(
Throwable
.
class
);
...
...
@@ -315,7 +315,6 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase {
mv
.
dup
();
mv
.
aconst
(
mi
.
getName
());
mv
.
aconst
(
Type
.
getMethodType
(
mi
.
type
.
toMethodDescriptorString
()));
mv
.
iconst
(
mi
.
method
.
isVarArgs
()
?
1
:
0
);
mv
.
invokestatic
(
SERVICES_CLASS_TYPE_NAME
,
"getHandle"
,
GET_HANDLE_OBJECT_DESCRIPTOR
);
mv
.
putstatic
(
generatedClassName
,
mi
.
methodHandleClassFieldName
,
METHOD_HANDLE_TYPE_DESCRIPTOR
);
}
...
...
@@ -459,7 +458,6 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase {
mv
.
aconst
(
mi
.
getName
());
}
mv
.
aconst
(
Type
.
getMethodType
(
mi
.
type
.
toMethodDescriptorString
()));
mv
.
iconst
(
mi
.
method
.
isVarArgs
()
?
1
:
0
);
mv
.
invokestatic
(
SERVICES_CLASS_TYPE_NAME
,
"getHandle"
,
getHandleDescriptor
);
}
mv
.
putfield
(
generatedClassName
,
mi
.
methodHandleInstanceFieldName
,
METHOD_HANDLE_TYPE_DESCRIPTOR
);
...
...
src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
浏览文件 @
858f89e2
...
...
@@ -50,12 +50,11 @@ public class JavaAdapterServices {
* handles for their abstract method implementations.
* @param fn the script function
* @param type the method type it has to conform to
* @param varArg if the Java method for which the function is being adapted is a variable arity method
* @return the appropriately adapted method handle for invoking the script function.
*/
public
static
MethodHandle
getHandle
(
final
ScriptFunction
fn
,
final
MethodType
type
,
final
boolean
varArg
)
{
public
static
MethodHandle
getHandle
(
final
ScriptFunction
fn
,
final
MethodType
type
)
{
// JS "this" will be null for SAMs
return
adaptHandle
(
fn
.
getBoundInvokeHandle
(
null
),
type
,
varArg
);
return
adaptHandle
(
fn
.
getBoundInvokeHandle
(
null
),
type
);
}
/**
...
...
@@ -66,12 +65,11 @@ public class JavaAdapterServices {
* @param obj the script obj
* @param name the name of the property that contains the function
* @param type the method type it has to conform to
* @param varArg if the Java method for which the function is being adapted is a variable arity method
* @return the appropriately adapted method handle for invoking the script function, or null if the value of the
* property is either null or undefined, or "toString" was requested as the name, but the object doesn't directly
* define it but just inherits it through prototype.
*/
public
static
MethodHandle
getHandle
(
final
Object
obj
,
final
String
name
,
final
MethodType
type
,
final
boolean
varArg
)
{
public
static
MethodHandle
getHandle
(
final
Object
obj
,
final
String
name
,
final
MethodType
type
)
{
if
(!
(
obj
instanceof
ScriptObject
))
{
throw
typeError
(
"not.an.object"
,
ScriptRuntime
.
safeToString
(
obj
));
}
...
...
@@ -84,7 +82,7 @@ public class JavaAdapterServices {
final
Object
fnObj
=
sobj
.
get
(
name
);
if
(
fnObj
instanceof
ScriptFunction
)
{
return
adaptHandle
(((
ScriptFunction
)
fnObj
).
getBoundInvokeHandle
(
sobj
),
type
,
varArg
);
return
adaptHandle
(((
ScriptFunction
)
fnObj
).
getBoundInvokeHandle
(
sobj
),
type
);
}
else
if
(
fnObj
==
null
||
fnObj
instanceof
Undefined
)
{
return
null
;
}
else
{
...
...
@@ -108,7 +106,7 @@ public class JavaAdapterServices {
classOverrides
.
set
(
overrides
);
}
private
static
MethodHandle
adaptHandle
(
final
MethodHandle
handle
,
final
MethodType
type
,
final
boolean
varArg
)
{
return
Bootstrap
.
getLinkerServices
().
asType
(
ScriptObject
.
pairArguments
(
handle
,
type
,
varArg
),
type
);
private
static
MethodHandle
adaptHandle
(
final
MethodHandle
handle
,
final
MethodType
type
)
{
return
Bootstrap
.
getLinkerServices
().
asType
(
ScriptObject
.
pairArguments
(
handle
,
type
,
false
),
type
);
}
}
test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
浏览文件 @
858f89e2
...
...
@@ -906,4 +906,26 @@ public class ScriptEngineTest {
fail
(
se
.
getMessage
());
}
}
@Test
/**
* Tests whether invocation of a JavaScript method through a variable arity Java method will pass the vararg array.
* Both non-vararg and vararg JavaScript methods are tested.
* @throws ScriptException
*/
public
void
variableArityInterfaceTest
()
throws
ScriptException
{
final
ScriptEngineManager
m
=
new
ScriptEngineManager
();
final
ScriptEngine
e
=
m
.
getEngineByName
(
"nashorn"
);
e
.
eval
(
"function test1(i, strings) {"
+
" return 'i == ' + i + ', strings instanceof java.lang.String[] == ' + (strings instanceof Java.type('java.lang.String[]')) + ', strings == ' + java.util.Arrays.toString(strings)"
+
"}"
+
"function test2() {"
+
" return 'arguments[0] == ' + arguments[0] + ', arguments[1] instanceof java.lang.String[] == ' + (arguments[1] instanceof Java.type('java.lang.String[]')) + ', arguments[1] == ' + java.util.Arrays.toString(arguments[1])"
+
"}"
);
final
VariableArityTestInterface
itf
=
((
Invocable
)
e
).
getInterface
(
VariableArityTestInterface
.
class
);
Assert
.
assertEquals
(
itf
.
test1
(
42
,
"a"
,
"b"
),
"i == 42, strings instanceof java.lang.String[] == true, strings == [a, b]"
);
Assert
.
assertEquals
(
itf
.
test2
(
44
,
"c"
,
"d"
,
"e"
),
"arguments[0] == 44, arguments[1] instanceof java.lang.String[] == true, arguments[1] == [c, d, e]"
);
}
}
test/src/jdk/nashorn/api/scripting/VariableArityTestInterface.java
0 → 100644
浏览文件 @
858f89e2
/*
* 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. 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.
*/
package
jdk.nashorn.api.scripting
;
public
interface
VariableArityTestInterface
{
public
String
test1
(
int
i
,
String
...
strings
);
public
String
test2
(
int
i
,
String
...
strings
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录