Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
f67fa382
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看板
提交
f67fa382
编写于
6月 12, 2013
作者:
R
rbackman
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8016131: nsk/sysdict/vm/stress/chain tests crash the VM in 'entry_frame_is_first()'
Reviewed-by: jrose, kvn, mgronlun
上级
7b456f8d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
39 addition
and
9 deletion
+39
-9
src/cpu/sparc/vm/frame_sparc.inline.hpp
src/cpu/sparc/vm/frame_sparc.inline.hpp
+2
-2
src/cpu/x86/vm/frame_x86.inline.hpp
src/cpu/x86/vm/frame_x86.inline.hpp
+2
-3
src/share/vm/prims/forte.cpp
src/share/vm/prims/forte.cpp
+7
-2
src/share/vm/runtime/frame.cpp
src/share/vm/runtime/frame.cpp
+12
-1
src/share/vm/runtime/frame.hpp
src/share/vm/runtime/frame.hpp
+3
-1
src/share/vm/runtime/javaCalls.hpp
src/share/vm/runtime/javaCalls.hpp
+2
-0
src/share/vm/runtime/thread.cpp
src/share/vm/runtime/thread.cpp
+8
-0
src/share/vm/runtime/thread.hpp
src/share/vm/runtime/thread.hpp
+3
-0
未找到文件。
src/cpu/sparc/vm/frame_sparc.inline.hpp
浏览文件 @
f67fa382
...
...
@@ -240,10 +240,10 @@ inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
#endif // CC_INTERP
inline
JavaCallWrapper
*
frame
::
entry_frame_call_wrappe
r
()
const
{
inline
JavaCallWrapper
*
*
frame
::
entry_frame_call_wrapper_add
r
()
const
{
// note: adjust this code if the link argument in StubGenerator::call_stub() changes!
const
Argument
link
=
Argument
(
0
,
false
);
return
(
JavaCallWrapper
*
)
sp
()[
link
.
as_in
().
as_register
()
->
sp_offset_in_saved_window
()];
return
(
JavaCallWrapper
*
*
)
&
sp
()[
link
.
as_in
().
as_register
()
->
sp_offset_in_saved_window
()];
}
...
...
src/cpu/x86/vm/frame_x86.inline.hpp
浏览文件 @
f67fa382
...
...
@@ -272,11 +272,10 @@ inline jint frame::interpreter_frame_expression_stack_direction() { return -1; }
// Entry frames
inline
JavaCallWrapper
*
frame
::
entry_frame_call_wrappe
r
()
const
{
return
(
JavaCallWrapper
*
)
at
(
entry_frame_call_wrapper_offset
);
inline
JavaCallWrapper
*
*
frame
::
entry_frame_call_wrapper_add
r
()
const
{
return
(
JavaCallWrapper
*
*
)
addr_
at
(
entry_frame_call_wrapper_offset
);
}
// Compiled frames
inline
int
frame
::
local_offset_for_compiler
(
int
local_index
,
int
nof_args
,
int
max_nof_locals
,
int
max_nof_monitors
)
{
...
...
src/share/vm/prims/forte.cpp
浏览文件 @
f67fa382
...
...
@@ -31,6 +31,7 @@
#include "oops/oop.inline.hpp"
#include "oops/oop.inline2.hpp"
#include "prims/forte.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/thread.hpp"
#include "runtime/vframe.hpp"
#include "runtime/vframeArray.hpp"
...
...
@@ -308,10 +309,14 @@ static bool find_initial_Java_frame(JavaThread* thread,
for
(
loop_count
=
0
;
loop_count
<
loop_max
;
loop_count
++
)
{
if
(
candidate
.
is_first_frame
())
{
if
(
candidate
.
is_entry_frame
())
{
// jcw is NULL if the java call wrapper couldn't be found
JavaCallWrapper
*
jcw
=
candidate
.
entry_frame_call_wrapper_if_safe
(
thread
);
// If initial frame is frame from StubGenerator and there is no
// previous anchor, there are no java frames associated with a method
return
false
;
if
(
jcw
==
NULL
||
jcw
->
is_first_frame
())
{
return
false
;
}
}
if
(
candidate
.
is_interpreted_frame
())
{
...
...
src/share/vm/runtime/frame.cpp
浏览文件 @
f67fa382
...
...
@@ -221,9 +221,20 @@ bool frame::is_first_java_frame() const {
bool
frame
::
entry_frame_is_first
()
const
{
return
entry_frame_call_wrapper
()
->
anchor
()
->
last_Java_sp
()
==
NULL
;
return
entry_frame_call_wrapper
()
->
is_first_frame
()
;
}
JavaCallWrapper
*
frame
::
entry_frame_call_wrapper_if_safe
(
JavaThread
*
thread
)
const
{
JavaCallWrapper
**
jcw
=
entry_frame_call_wrapper_addr
();
address
addr
=
(
address
)
jcw
;
// addr must be within the usable part of the stack
if
(
thread
->
is_in_usable_stack
(
addr
))
{
return
*
jcw
;
}
return
NULL
;
}
bool
frame
::
should_be_deoptimized
()
const
{
if
(
_deopt_state
==
is_deoptimized
||
...
...
src/share/vm/runtime/frame.hpp
浏览文件 @
f67fa382
...
...
@@ -353,7 +353,9 @@ class frame VALUE_OBJ_CLASS_SPEC {
public:
// Entry frames
JavaCallWrapper
*
entry_frame_call_wrapper
()
const
;
JavaCallWrapper
*
entry_frame_call_wrapper
()
const
{
return
*
entry_frame_call_wrapper_addr
();
}
JavaCallWrapper
*
entry_frame_call_wrapper_if_safe
(
JavaThread
*
thread
)
const
;
JavaCallWrapper
**
entry_frame_call_wrapper_addr
()
const
;
intptr_t
*
entry_frame_argument_at
(
int
offset
)
const
;
// tells whether there is another chunk of Delta stack above
...
...
src/share/vm/runtime/javaCalls.hpp
浏览文件 @
f67fa382
...
...
@@ -80,6 +80,8 @@ class JavaCallWrapper: StackObj {
oop
receiver
()
{
return
_receiver
;
}
void
oops_do
(
OopClosure
*
f
);
bool
is_first_frame
()
const
{
return
_anchor
.
last_Java_sp
()
==
NULL
;
}
};
...
...
src/share/vm/runtime/thread.cpp
浏览文件 @
f67fa382
...
...
@@ -954,6 +954,14 @@ bool Thread::is_in_stack(address adr) const {
}
bool
Thread
::
is_in_usable_stack
(
address
adr
)
const
{
size_t
stack_guard_size
=
os
::
uses_stack_guard_pages
()
?
(
StackYellowPages
+
StackRedPages
)
*
os
::
vm_page_size
()
:
0
;
size_t
usable_stack_size
=
_stack_size
-
stack_guard_size
;
return
((
adr
<
stack_base
())
&&
(
adr
>=
stack_base
()
-
usable_stack_size
));
}
// We had to move these methods here, because vm threads get into ObjectSynchronizer::enter
// However, there is a note in JavaThread::is_lock_owned() about the VM threads not being
// used for compilation in the future. If that change is made, the need for these methods
...
...
src/share/vm/runtime/thread.hpp
浏览文件 @
f67fa382
...
...
@@ -521,6 +521,9 @@ public:
// Check if address is in the stack of the thread (not just for locks).
// Warning: the method can only be used on the running thread
bool
is_in_stack
(
address
adr
)
const
;
// Check if address is in the usable part of the stack (excludes protected
// guard pages)
bool
is_in_usable_stack
(
address
adr
)
const
;
// Sets this thread as starting thread. Returns failure if thread
// creation fails due to lack of memory, too many threads etc.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录