8290004: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must…

… have PC Reviewed-by: rrich, lucy
openjdk · Jul 11, 2022 · cb6e9cb · cb6e9cb · openjdk-notifier · Jul 11, 2022
1 parent 0494291
commit cb6e9cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.cpp
@@ -32,15 +32,9 @@
 frame JavaThread::pd_last_frame() {
   assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
 
-  intptr_t* sp = last_Java_sp();
+  intptr_t* sp = Atomic::load_acquire(&_anchor._last_Java_sp);
   address pc = _anchor.last_Java_pc();
 
-  // Last_Java_pc is not set, if we come here from compiled code.
-  // Assume spill slot for link register contains a suitable pc.
-  // Should have been filled by method entry code.
-  if (pc == NULL)
-    pc =  (address) *(sp + 2);
-
   return frame(sp, pc);
 }
 

diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
@@ -31,16 +31,9 @@
 frame JavaThread::pd_last_frame() {
   assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
 
-  intptr_t* sp = last_Java_sp();
+  intptr_t* sp = Atomic::load_acquire(&_anchor._last_Java_sp);
   address pc = _anchor.last_Java_pc();
 
-  // Last_Java_pc is not set, if we come here from compiled code.
-  // Assume spill slot for link register contains a suitable pc.
-  // Should have been filled by method entry code.
-  if (pc == NULL) {
-    pc = (address) *(sp + 2);
-  }
-
   return frame(sp, pc);
 }