*** old/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp	Wed Sep 16 15:17:58 2015
--- new/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp	Wed Sep 16 15:17:58 2015

*** 64,85 ****
--- 64,85 ----
        return false;
      }
  
      frame ret_frame(ret_sp, ret_fp, addr.pc());
      if (!ret_frame.safe_for_sender(jt)) {
! #ifdef COMPILER2
!       // C2 uses ebp as a general register see if NULL fp helps
! #if defined(COMPILER2) || INCLUDE_JVMCI
!       // C2 and JVMCI use ebp as a general register see if NULL fp helps
        frame ret_frame2(ret_sp, NULL, addr.pc());
        if (!ret_frame2.safe_for_sender(jt)) {
          // nothing else to try if the frame isn't good
          return false;
        }
        ret_frame = ret_frame2;
  #else
        // nothing else to try if the frame isn't good
        return false;
! #endif /* COMPILER2 || INCLUDE_JVMCI */
      }
      *fr_addr = ret_frame;
      return true;
    }