Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_nashorn
提交
83f6b24f
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,发现更多精彩内容 >>
提交
83f6b24f
编写于
6月 05, 2013
作者:
S
sundar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8015945: loadWithNewGlobal return value has to be properly wrapped
Reviewed-by: lagergren, hannesw
上级
6e3abded
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
106 addition
and
12 deletion
+106
-12
src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+42
-11
src/jdk/nashorn/internal/runtime/Context.java
src/jdk/nashorn/internal/runtime/Context.java
+2
-1
test/script/basic/JDK-8015945.js
test/script/basic/JDK-8015945.js
+55
-0
test/script/basic/JDK-8015945.js.EXPECTED
test/script/basic/JDK-8015945.js.EXPECTED
+7
-0
未找到文件。
src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
浏览文件 @
83f6b24f
...
...
@@ -342,20 +342,28 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
});
}
// package-privates below this.
ScriptObject
getScriptObject
()
{
return
sobj
;
}
static
Object
translateUndefined
(
Object
obj
)
{
return
(
obj
==
ScriptRuntime
.
UNDEFINED
)?
null
:
obj
;
}
// These are public only so that Context can access these.
static
Object
wrap
(
final
Object
obj
,
final
ScriptObject
homeGlobal
)
{
/**
* Make a script object mirror on given object if needed.
*
* @param obj object to be wrapped
* @param homeGlobal global to which this object belongs
* @return wrapped object
*/
public
static
Object
wrap
(
final
Object
obj
,
final
ScriptObject
homeGlobal
)
{
return
(
obj
instanceof
ScriptObject
)
?
new
ScriptObjectMirror
((
ScriptObject
)
obj
,
homeGlobal
)
:
obj
;
}
static
Object
unwrap
(
final
Object
obj
,
final
ScriptObject
homeGlobal
)
{
/**
* Unwrap a script object mirror if needed.
*
* @param obj object to be unwrapped
* @param homeGlobal global to which this object belongs
* @return unwrapped object
*/
public
static
Object
unwrap
(
final
Object
obj
,
final
ScriptObject
homeGlobal
)
{
if
(
obj
instanceof
ScriptObjectMirror
)
{
final
ScriptObjectMirror
mirror
=
(
ScriptObjectMirror
)
obj
;
return
(
mirror
.
global
==
homeGlobal
)?
mirror
.
sobj
:
obj
;
...
...
@@ -364,7 +372,14 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
return
obj
;
}
static
Object
[]
wrapArray
(
final
Object
[]
args
,
final
ScriptObject
homeGlobal
)
{
/**
* Wrap an array of object to script object mirrors if needed.
*
* @param args array to be unwrapped
* @param homeGlobal global to which this object belongs
* @return wrapped array
*/
public
static
Object
[]
wrapArray
(
final
Object
[]
args
,
final
ScriptObject
homeGlobal
)
{
if
(
args
==
null
||
args
.
length
==
0
)
{
return
args
;
}
...
...
@@ -378,7 +393,14 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
return
newArgs
;
}
static
Object
[]
unwrapArray
(
final
Object
[]
args
,
final
ScriptObject
homeGlobal
)
{
/**
* Unwrap an array of script object mirrors if needed.
*
* @param args array to be unwrapped
* @param homeGlobal global to which this object belongs
* @return unwrapped array
*/
public
static
Object
[]
unwrapArray
(
final
Object
[]
args
,
final
ScriptObject
homeGlobal
)
{
if
(
args
==
null
||
args
.
length
==
0
)
{
return
args
;
}
...
...
@@ -391,4 +413,13 @@ public final class ScriptObjectMirror extends JSObject implements Bindings {
}
return
newArgs
;
}
// package-privates below this.
ScriptObject
getScriptObject
()
{
return
sobj
;
}
static
Object
translateUndefined
(
Object
obj
)
{
return
(
obj
==
ScriptRuntime
.
UNDEFINED
)?
null
:
obj
;
}
}
src/jdk/nashorn/internal/runtime/Context.java
浏览文件 @
83f6b24f
...
...
@@ -48,6 +48,7 @@ import java.security.PrivilegedAction;
import
java.security.ProtectionDomain
;
import
jdk.internal.org.objectweb.asm.ClassReader
;
import
jdk.internal.org.objectweb.asm.util.CheckClassAdapter
;
import
jdk.nashorn.api.scripting.ScriptObjectMirror
;
import
jdk.nashorn.internal.codegen.Compiler
;
import
jdk.nashorn.internal.codegen.ObjectClassGenerator
;
import
jdk.nashorn.internal.ir.FunctionNode
;
...
...
@@ -518,7 +519,7 @@ public final class Context {
setGlobalTrusted
(
newGlobal
);
try
{
return
load
(
newGlobal
,
from
);
return
ScriptObjectMirror
.
wrap
(
load
(
newGlobal
,
from
),
newGlobal
);
}
finally
{
setGlobalTrusted
(
oldGlobal
);
}
...
...
test/script/basic/JDK-8015945.js
0 → 100644
浏览文件 @
83f6b24f
/*
* 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.
*
* 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-8015945: loadWithNewGlobal return value has to be properly wrapped
*
* @test
* @option -scripting
* @run
*/
var
global
=
loadWithNewGlobal
({
name
:
"
<code>
"
,
script
:
<<
EOF
function
squares
()
{
var
res
=
new
Array
(
arguments
.
length
);
for
(
var
i
in
arguments
)
{
res
[
i
]
=
arguments
[
i
]
*
arguments
[
i
]
}
return
res
;
}
this
;
EOF
})
print
(
"
global an Object?
"
+
(
global
instanceof
Object
));
var
res
=
global
.
squares
(
2
,
3
,
4
,
5
);
print
(
"
global.squares returns Array?
"
+
(
res
instanceof
Array
));
// still can access array index properties and length
print
(
"
result length
"
+
res
.
length
);
for
(
var
i
in
res
)
{
print
(
i
+
"
=
"
+
res
[
i
]);
}
test/script/basic/JDK-8015945.js.EXPECTED
0 → 100644
浏览文件 @
83f6b24f
global an Object? false
global.squares returns Array? false
result length 4
0 = 4
1 = 9
2 = 16
3 = 25
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录