You need to sign in or sign up before continuing.
提交 e6156495 编写于 作者: D dholmes

Merge

...@@ -372,7 +372,7 @@ frame os::current_frame() { ...@@ -372,7 +372,7 @@ frame os::current_frame() {
CAST_FROM_FN_PTR(address, os::current_frame)); CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) { if (os::is_first_C_frame(&myframe)) {
// stack is not walkable // stack is not walkable
return frame(NULL, NULL, NULL); return frame();
} else { } else {
return os::get_sender_for_C_frame(&myframe); return os::get_sender_for_C_frame(&myframe);
} }
......
...@@ -189,7 +189,7 @@ frame os::current_frame() { ...@@ -189,7 +189,7 @@ frame os::current_frame() {
CAST_FROM_FN_PTR(address, os::current_frame)); CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) { if (os::is_first_C_frame(&myframe)) {
// stack is not walkable // stack is not walkable
return frame(NULL, NULL, NULL); return frame();
} else { } else {
return os::get_sender_for_C_frame(&myframe); return os::get_sender_for_C_frame(&myframe);
} }
......
...@@ -399,7 +399,7 @@ frame os::current_frame() { ...@@ -399,7 +399,7 @@ frame os::current_frame() {
typedef intptr_t* get_fp_func (); typedef intptr_t* get_fp_func ();
get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*, get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*,
StubRoutines::x86::get_previous_fp_entry()); StubRoutines::x86::get_previous_fp_entry());
if (func == NULL) return frame(NULL, NULL, NULL); if (func == NULL) return frame();
intptr_t* fp = (*func)(); intptr_t* fp = (*func)();
#else #else
intptr_t* fp = _get_previous_fp(); intptr_t* fp = _get_previous_fp();
...@@ -410,7 +410,7 @@ frame os::current_frame() { ...@@ -410,7 +410,7 @@ frame os::current_frame() {
CAST_FROM_FN_PTR(address, os::current_frame)); CAST_FROM_FN_PTR(address, os::current_frame));
if (os::is_first_C_frame(&myframe)) { if (os::is_first_C_frame(&myframe)) {
// stack is not walkable // stack is not walkable
return frame(NULL, NULL, NULL); return frame();
} else { } else {
return os::get_sender_for_C_frame(&myframe); return os::get_sender_for_C_frame(&myframe);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册