# HG changeset patch
# User thartmann
# Date 1458820251 0
# Node ID cd1a170c90193da84763283ba3071184b8f8cf53
# Parent  bca375d368ed8ca4b20829ab763d7f52f1e7188e# Parent  eb4c0c9940e0adc3d1df6c9c28f2f1ca965076c1
Merge

diff -r bca375d368ed -r cd1a170c9019 hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	Thu Mar 24 11:21:49 2016 +0100
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp	Thu Mar 24 11:50:51 2016 +0000
@@ -277,7 +277,7 @@
       return false;
     } else {
       *fr = os::fetch_frame_from_ucontext(thread, uc);
-      *fr = frame(fr->sender_sp(), frame::unpatchable, fr->sender_pc());
+      *fr = frame(fr->sender_sp(), fr->sp());
       if (!fr->is_java_frame()) {
         assert(fr->safe_for_sender(thread), "Safety check");
         *fr = fr->java_sender();