Remove link_or_null since it was only used in one place.

schmelter-sap · Dec 28, 2023 · 64b1a7a · 64b1a7a
1 parent 74e3790
commit 64b1a7a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 41 deletions.
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -210,11 +210,6 @@ inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != nullptr
 
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
-inline intptr_t* frame::link_or_null() const {
-  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
-  return os::is_readable_pointer(ptr) ? *ptr : nullptr;
-}
-
 inline intptr_t* frame::unextended_sp() const          { assert_absolute(); return _unextended_sp; }
 inline void frame::set_unextended_sp(intptr_t* value)  { _unextended_sp = value; }
 inline int  frame::offset_unextended_sp() const        { assert_offset();   return _offset_unextended_sp; }

diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp
@@ -108,11 +108,6 @@ inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != nullptr
 
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
-inline intptr_t* frame::link_or_null() const {
-  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
-  return os::is_readable_pointer(ptr) ? *ptr : nullptr;
-}
-
 inline intptr_t* frame::unextended_sp() const     { return _unextended_sp; }
 
 // Return address:

diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -175,10 +175,6 @@ inline intptr_t* frame::link() const {
   return (intptr_t*)callers_abi()->callers_sp;
 }
 
-inline intptr_t* frame::link_or_null() const {
-  return link();
-}
-
 inline intptr_t* frame::real_fp() const {
   return fp();
 }

diff --git a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
@@ -201,11 +201,6 @@ inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != nullptr
 
 inline intptr_t* frame::link() const              { return (intptr_t*) *(intptr_t **)addr_at(link_offset); }
 
-inline intptr_t* frame::link_or_null() const {
-  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
-  return os::is_readable_pointer(ptr) ? *ptr : nullptr;
-}
-
 inline intptr_t* frame::unextended_sp() const          { assert_absolute(); return _unextended_sp; }
 inline void frame::set_unextended_sp(intptr_t* value)  { _unextended_sp = value; }
 inline int frame::offset_unextended_sp() const         { assert_offset(); return _offset_unextended_sp; }

diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -175,10 +175,6 @@ inline intptr_t* frame::link() const {
   return (intptr_t*) callers_abi()->callers_sp;
 }
 
-inline intptr_t* frame::link_or_null() const {
-  return link();
-}
-
 inline intptr_t* frame::interpreter_frame_locals() const {
   return (intptr_t*) (ijava_state()->locals);
 }

diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
@@ -196,11 +196,6 @@ inline bool frame::is_older(intptr_t* id) const   { assert(this->id() != nullptr
 
 inline intptr_t* frame::link() const              { return *(intptr_t **)addr_at(link_offset); }
 
-inline intptr_t* frame::link_or_null() const {
-  intptr_t** ptr = (intptr_t **)addr_at(link_offset);
-  return os::is_readable_pointer(ptr) ? *ptr : nullptr;
-}
-
 inline intptr_t* frame::unextended_sp() const          { assert_absolute(); return _unextended_sp; }
 inline void frame::set_unextended_sp(intptr_t* value)  { _unextended_sp = value; }
 inline int  frame::offset_unextended_sp() const        { assert_offset();   return _offset_unextended_sp; }

diff --git a/src/hotspot/cpu/zero/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp
@@ -90,11 +90,6 @@ inline intptr_t* frame::link() const {
   return nullptr;
 }
 
-inline intptr_t* frame::link_or_null() const {
-  ShouldNotCallThis();
-  return nullptr;
-}
-
 inline interpreterState frame::get_interpreterState() const {
   return zero_interpreterframe()->interpreter_state();
 }

diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
@@ -265,9 +265,6 @@ class frame {
   // might crash if the frame has no parent
   intptr_t* link() const;
 
-  // Link (i.e., the pointer to the previous frame) or null if the link cannot be accessed
-  intptr_t* link_or_null() const;
-
   // Return address
   address  sender_pc() const;
 

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
@@ -1302,13 +1302,10 @@ bool os::is_first_C_frame(frame* fr) {
   if (is_pointer_bad(fr->sp())) return true;
 
   uintptr_t ufp    = (uintptr_t)fr->fp();
-  if (is_pointer_bad(fr->fp())) return true;
-
-  uintptr_t old_sp = (uintptr_t)fr->sender_sp();
-  if ((uintptr_t)fr->sender_sp() == (uintptr_t)-1 || is_pointer_bad(fr->sender_sp())) return true;
+  if (is_pointer_bad((intptr_t*)ufp)) return true;
 
   uintptr_t old_fp = (uintptr_t)fr->link();
-  if (old_fp == 0 || old_fp == (uintptr_t)-1 || old_fp == ufp) return true;
+  if (old_fp == 0 || old_fp == ufp) return true;
 
   // stack grows downwards; if old_fp is below current fp or if the stack
   // frame is too large, either the stack is corrupted or fp is not saved
@@ -1317,6 +1314,7 @@ bool os::is_first_C_frame(frame* fr) {
   if (old_fp < ufp) return true;
   if (old_fp - ufp > 64 * K) return true;
 
+  if (is_pointer_bad(fr->sender_sp()))    return true;
   if (is_pointer_bad((intptr_t*) old_fp)) return true;
 
   return false;