Mercurial > hg > truffle
changeset 7988:f3ea1af9207a
Merge
author | dholmes |
---|---|
date | Tue, 05 Feb 2013 00:59:40 -0800 |
parents | a401757763f9 (current diff) 12285410684f (diff) |
children | 454d7cc622ab 8d9fc28831cc |
files | |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Feb 04 22:59:45 2013 -0800 +++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Feb 05 00:59:40 2013 -0800 @@ -372,7 +372,7 @@ CAST_FROM_FN_PTR(address, os::current_frame)); if (os::is_first_C_frame(&myframe)) { // stack is not walkable - return frame(NULL, NULL, NULL); + return frame(); } else { return os::get_sender_for_C_frame(&myframe); }
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Feb 04 22:59:45 2013 -0800 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Feb 05 00:59:40 2013 -0800 @@ -189,7 +189,7 @@ CAST_FROM_FN_PTR(address, os::current_frame)); if (os::is_first_C_frame(&myframe)) { // stack is not walkable - return frame(NULL, NULL, NULL); + return frame(); } else { return os::get_sender_for_C_frame(&myframe); }
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Mon Feb 04 22:59:45 2013 -0800 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Tue Feb 05 00:59:40 2013 -0800 @@ -399,7 +399,7 @@ typedef intptr_t* get_fp_func (); get_fp_func* func = CAST_TO_FN_PTR(get_fp_func*, StubRoutines::x86::get_previous_fp_entry()); - if (func == NULL) return frame(NULL, NULL, NULL); + if (func == NULL) return frame(); intptr_t* fp = (*func)(); #else intptr_t* fp = _get_previous_fp(); @@ -410,7 +410,7 @@ CAST_FROM_FN_PTR(address, os::current_frame)); if (os::is_first_C_frame(&myframe)) { // stack is not walkable - return frame(NULL, NULL, NULL); + return frame(); } else { return os::get_sender_for_C_frame(&myframe); }