src/hotspot/cpu/sparc/frame_sparc.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 175,200 ****
  bool frame::safe_for_sender(JavaThread *thread) {
  
    address _SP = (address) sp();
    address _FP = (address) fp();
    address _UNEXTENDED_SP = (address) unextended_sp();
-   // sp must be within the stack
-   bool sp_safe = (_SP <= thread->stack_base()) &&
-                  (_SP >= thread->stack_base() - thread->stack_size());
  
!   if (!sp_safe) {
      return false;
    }
  
    // unextended sp must be within the stack and above or equal sp
!   bool unextended_sp_safe = (_UNEXTENDED_SP <= thread->stack_base()) &&
                              (_UNEXTENDED_SP >= _SP);
  
    if (!unextended_sp_safe) return false;
  
    // an fp must be within the stack and above (but not equal) sp
!   bool fp_safe = (_FP <= thread->stack_base()) &&
                   (_FP > _SP);
  
    // We know sp/unextended_sp are safe only fp is questionable here
  
    // If the current frame is known to the code cache then we can attempt to
--- 175,199 ----
  bool frame::safe_for_sender(JavaThread *thread) {
  
    address _SP = (address) sp();
    address _FP = (address) fp();
    address _UNEXTENDED_SP = (address) unextended_sp();
  
!   // consider stack guards when trying to determine "safe" stack pointers
!   // sp must be within the usable part of the stack (not in guards)
!   if (!thread->is_in_usable_stack(_SP)) {
      return false;
    }
  
    // unextended sp must be within the stack and above or equal sp
!   bool unextended_sp_safe = (_UNEXTENDED_SP < thread->stack_base()) &&
                              (_UNEXTENDED_SP >= _SP);
  
    if (!unextended_sp_safe) return false;
  
    // an fp must be within the stack and above (but not equal) sp
!   bool fp_safe = (_FP < thread->stack_base()) &&
                   (_FP > _SP);
  
    // We know sp/unextended_sp are safe only fp is questionable here
  
    // If the current frame is known to the code cache then we can attempt to
*** 278,288 ****
      if (sender.is_entry_frame()) {
        // Validate the JavaCallWrapper an entry frame must have
  
        address jcw = (address)sender.entry_frame_call_wrapper();
  
!       bool jcw_safe = (jcw <= thread->stack_base()) && (jcw > sender_fp);
  
        return jcw_safe;
      }
  
      // If the frame size is 0 something (or less) is bad because every nmethod has a non-zero frame size
--- 277,287 ----
      if (sender.is_entry_frame()) {
        // Validate the JavaCallWrapper an entry frame must have
  
        address jcw = (address)sender.entry_frame_call_wrapper();
  
!       bool jcw_safe = (jcw < thread->stack_base()) && (jcw > sender_fp);
  
        return jcw_safe;
      }
  
      // If the frame size is 0 something (or less) is bad because every nmethod has a non-zero frame size
*** 670,680 ****
  
    // validate locals
  
    address locals =  (address) *interpreter_frame_locals_addr();
  
!   if (locals > thread->stack_base() || locals < (address) fp()) return false;
  
    // We'd have to be pretty unlucky to be mislead at this point
    return true;
  }
  
--- 669,679 ----
  
    // validate locals
  
    address locals =  (address) *interpreter_frame_locals_addr();
  
!   if (locals >= thread->stack_base() || locals < (address) fp()) return false;
  
    // We'd have to be pretty unlucky to be mislead at this point
    return true;
  }