Mercurial > hg > truffle
diff src/os_cpu/windows_x86/vm/os_windows_x86.cpp @ 7987:12285410684f
8006508: Wrong frame constructor is called in os_linux_x86.cpp
Reviewed-by: dholmes, coleenp
Contributed-by: Jeremy Manson <jeremymanson@google.com>
| author | dholmes |
|---|---|
| date | Mon, 04 Feb 2013 23:53:10 -0500 |
| parents | d2f8c38e543d |
| children | 5fc51c1ecdeb 980532a806a5 |
line wrap: on
line diff
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Mon Feb 04 08:26:02 2013 -0500 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Mon Feb 04 23:53:10 2013 -0500 @@ -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); }