Merge
authorzgu
Mon, 21 Jul 2014 09:48:38 -0400
changeset 25723 b07df7835eac
parent 25722 72f566374afc (diff)
parent 25721 9883ebc9eb97 (current diff)
child 25724 a24c35793c68
Merge
hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
hotspot/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp	Mon Jul 21 10:42:20 2014 +0000
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp	Mon Jul 21 09:48:38 2014 -0400
@@ -118,7 +118,7 @@
       *ret_sp = os::Linux::ucontext_get_sp(uc);
     }
     if (ret_fp) {
-      *ret_fp = os::Linux::ucontext_get_fp(uc);
+      *ret_fp = (intptr_t*)NULL;
     }
   } else {
     // construct empty ExtendedPC for return value checking
@@ -136,9 +136,8 @@
 
 frame os::fetch_frame_from_context(void* ucVoid) {
   intptr_t* sp;
-  intptr_t* fp;
-  ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
-  return frame(sp, fp, epc.pc());
+  ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, NULL);
+  return frame(sp, frame::unpatchable, epc.pc());
 }
 
 frame os::get_sender_for_C_frame(frame* fr) {