From 61066d37958542bb5cf0ab75aaf5fb04577c799d Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Mon, 15 Aug 2016 16:04:16 +0200
Subject: [PATCH] 8156659: assert(CodeCache::find_blob_unsafe(_pc) == _cb)
failed: inconsistent
Stackwalking from corrupt frame
Reviewed-by: dlong, thartmann
---
.../src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
index be5134db66f..a4a4e3da963 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
@@ -274,8 +274,14 @@ bool os::Solaris::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_
// stack overflow handling
return false;
} else {
- *fr = os::fetch_frame_from_ucontext(thread, uc);
- *fr = frame(fr->sender_sp(), fr->sp());
+ // Returned frame will be the caller of the method that faults on the stack bang.
+ // Register window not yet rotated (happens at SAVE after stack bang), so there is no new
+ // frame to go with the faulting PC. Using caller SP that is still in SP, and caller PC
+ // that was written to O7 at call.
+ intptr_t* sp = os::Solaris::ucontext_get_sp(uc);
+ address pc = (address)uc->uc_mcontext.gregs[REG_O7];
+ *fr = frame(sp, frame::unpatchable, pc);
+
if (!fr->is_java_frame()) {
assert(fr->safe_for_sender(thread), "Safety check");
*fr = fr->java_sender();