# HG changeset patch
# User dholmes
# Date 1360054780 28800
# Node ID f3ea1af9207aea4b4ce4e2d642d78de6531e5025
# Parent  a401757763f949f031b4d655246ae61aac8ea9bc# Parent  12285410684fc78fb4edaee92dccf479009d3887
Merge

diff -r a401757763f9 -r f3ea1af9207a src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
--- 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);
   }
diff -r a401757763f9 -r f3ea1af9207a src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- 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);
   }
diff -r a401757763f9 -r f3ea1af9207a src/os_cpu/windows_x86/vm/os_windows_x86.cpp
--- 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);
   }