Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
fe3bf367
D
dragonwell8_hotspot
项目概览
openanolis
/
dragonwell8_hotspot
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_hotspot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
fe3bf367
编写于
11月 23, 2016
作者:
S
shshahma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8155781: C2: opaque unsafe access triggers an assert
Reviewed-by: kvn, thartmann
上级
983d3b71
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
147 addition
and
10 deletion
+147
-10
src/share/vm/opto/library_call.cpp
src/share/vm/opto/library_call.cpp
+13
-10
test/compiler/unsafe/OpaqueAccesses.java
test/compiler/unsafe/OpaqueAccesses.java
+134
-0
未找到文件。
src/share/vm/opto/library_call.cpp
浏览文件 @
fe3bf367
...
...
@@ -2637,8 +2637,13 @@ bool LibraryCallKit::inline_unsafe_access(bool is_native_ptr, bool is_store, Bas
Compile
::
AliasType
*
alias_type
=
C
->
alias_type
(
adr_type
);
assert
(
alias_type
->
index
()
!=
Compile
::
AliasIdxBot
,
"no bare pointers here"
);
assert
(
alias_type
->
adr_type
()
==
TypeRawPtr
::
BOTTOM
||
alias_type
->
adr_type
()
==
TypeOopPtr
::
BOTTOM
||
alias_type
->
basic_type
()
!=
T_ILLEGAL
,
"field, array element or unknown"
);
// Only field, array element or unknown locations are supported.
if
(
alias_type
->
adr_type
()
!=
TypeRawPtr
::
BOTTOM
&&
alias_type
->
adr_type
()
!=
TypeOopPtr
::
BOTTOM
&&
alias_type
->
basic_type
()
==
T_ILLEGAL
)
{
return
false
;
}
bool
mismatched
=
false
;
BasicType
bt
=
alias_type
->
basic_type
();
if
(
bt
!=
T_ILLEGAL
)
{
...
...
@@ -2961,12 +2966,6 @@ bool LibraryCallKit::inline_unsafe_load_store(BasicType type, LoadStoreKind kind
newval
=
argument
(
4
);
// type: oop, int, or long
}
// Null check receiver.
receiver
=
null_check
(
receiver
);
if
(
stopped
())
{
return
true
;
}
// Build field offset expression.
// We currently rely on the cookies produced by Unsafe.xxxFieldOffset
// to be plain byte offsets, which are also the same as those accepted
...
...
@@ -2978,8 +2977,6 @@ bool LibraryCallKit::inline_unsafe_load_store(BasicType type, LoadStoreKind kind
const
TypePtr
*
adr_type
=
_gvn
.
type
(
adr
)
->
isa_ptr
();
Compile
::
AliasType
*
alias_type
=
C
->
alias_type
(
adr_type
);
assert
(
alias_type
->
adr_type
()
==
TypeRawPtr
::
BOTTOM
||
alias_type
->
adr_type
()
==
TypeOopPtr
::
BOTTOM
||
alias_type
->
basic_type
()
!=
T_ILLEGAL
,
"field, array element or unknown"
);
BasicType
bt
=
alias_type
->
basic_type
();
if
(
bt
!=
T_ILLEGAL
&&
((
bt
==
T_OBJECT
||
bt
==
T_ARRAY
)
!=
(
type
==
T_OBJECT
)))
{
...
...
@@ -2999,6 +2996,12 @@ bool LibraryCallKit::inline_unsafe_load_store(BasicType type, LoadStoreKind kind
}
}
// Null check receiver.
receiver
=
null_check
(
receiver
);
if
(
stopped
())
{
return
true
;
}
int
alias_idx
=
C
->
get_alias_index
(
adr_type
);
// Memory-model-wise, a LoadStore acts like a little synchronized
...
...
test/compiler/unsafe/OpaqueAccesses.java
0 → 100644
浏览文件 @
fe3bf367
/*
* 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. 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 8155781
* @modules java.base/jdk.internal.misc
*
* @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
* -XX:-TieredCompilation -Xbatch
* -XX:CompileCommand=dontinline,compiler.unsafe.OpaqueAccesses::test*
* compiler.unsafe.OpaqueAccesses
*/
package
compiler.unsafe
;
import
sun.misc.Unsafe
;
import
java.lang.reflect.Field
;
public
class
OpaqueAccesses
{
private
static
final
Unsafe
UNSAFE
=
Unsafe
.
getUnsafe
();
private
static
final
Object
INSTANCE
=
new
OpaqueAccesses
();
private
static
final
Object
[]
ARRAY
=
new
Object
[
10
];
private
static
final
long
F_OFFSET
;
private
static
final
long
E_OFFSET
;
static
{
try
{
Field
field
=
OpaqueAccesses
.
class
.
getDeclaredField
(
"f"
);
F_OFFSET
=
UNSAFE
.
objectFieldOffset
(
field
);
E_OFFSET
=
UNSAFE
.
arrayBaseOffset
(
ARRAY
.
getClass
());
}
catch
(
NoSuchFieldException
e
)
{
throw
new
Error
(
e
);
}
}
private
Object
f
=
new
Object
();
static
Object
testFixedOffsetField
(
Object
o
)
{
return
UNSAFE
.
getObject
(
o
,
F_OFFSET
);
}
static
int
testFixedOffsetHeader0
(
Object
o
)
{
return
UNSAFE
.
getInt
(
o
,
0
);
}
static
int
testFixedOffsetHeader4
(
Object
o
)
{
return
UNSAFE
.
getInt
(
o
,
4
);
}
static
Object
testFixedBase
(
long
off
)
{
return
UNSAFE
.
getObject
(
INSTANCE
,
off
);
}
static
Object
testOpaque
(
Object
o
,
long
off
)
{
return
UNSAFE
.
getObject
(
o
,
off
);
}
static
int
testFixedOffsetHeaderArray0
(
Object
[]
arr
)
{
return
UNSAFE
.
getInt
(
arr
,
0
);
}
static
int
testFixedOffsetHeaderArray4
(
Object
[]
arr
)
{
return
UNSAFE
.
getInt
(
arr
,
4
);
}
static
Object
testFixedOffsetArray
(
Object
[]
arr
)
{
return
UNSAFE
.
getObject
(
arr
,
E_OFFSET
);
}
static
Object
testFixedBaseArray
(
long
off
)
{
return
UNSAFE
.
getObject
(
ARRAY
,
off
);
}
static
Object
testOpaqueArray
(
Object
[]
o
,
long
off
)
{
return
UNSAFE
.
getObject
(
o
,
off
);
}
static
final
long
ADDR
=
UNSAFE
.
allocateMemory
(
10
);
static
boolean
flag
;
static
int
testMixedAccess
()
{
flag
=
!
flag
;
Object
o
=
(
flag
?
INSTANCE
:
null
);
long
off
=
(
flag
?
F_OFFSET
:
ADDR
);
return
UNSAFE
.
getInt
(
o
,
off
);
}
public
static
void
main
(
String
[]
args
)
{
for
(
int
i
=
0
;
i
<
20_000
;
i
++)
{
// Instance
testFixedOffsetField
(
INSTANCE
);
testFixedOffsetHeader0
(
INSTANCE
);
testFixedOffsetHeader4
(
INSTANCE
);
testFixedBase
(
F_OFFSET
);
testOpaque
(
INSTANCE
,
F_OFFSET
);
testMixedAccess
();
// Array
testFixedOffsetHeaderArray0
(
ARRAY
);
testFixedOffsetHeaderArray4
(
ARRAY
);
testFixedOffsetArray
(
ARRAY
);
testFixedBaseArray
(
E_OFFSET
);
testOpaqueArray
(
ARRAY
,
E_OFFSET
);
}
System
.
out
.
println
(
"TEST PASSED"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录