src/share/vm/runtime/stubRoutines.cpp

*** 29,38 ****
--- 29,39 ----
  #include "runtime/interfaceSupport.hpp"
  #include "runtime/timerTrace.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/copy.hpp"
+ #include "utilities/vmError.hpp"
  #ifdef COMPILER2
  #include "opto/runtime.hpp"
  #endif
  
  
*** 236,246 ****
  
  // simple test for SafeFetch32
  static void test_safefetch32() {
    if (CanUseSafeFetch32()) {
      int dummy = 17;
!     int* const p_invalid = (int*) get_segfault_address();
      int* const p_valid = &dummy;
      int result_invalid = SafeFetch32(p_invalid, 0xABC);
      assert(result_invalid == 0xABC, "SafeFetch32 error");
      int result_valid = SafeFetch32(p_valid, 0xABC);
      assert(result_valid == 17, "SafeFetch32 error");
--- 237,247 ----
  
  // simple test for SafeFetch32
  static void test_safefetch32() {
    if (CanUseSafeFetch32()) {
      int dummy = 17;
!     int* const p_invalid = (int*) VMError::get_segfault_address();
      int* const p_valid = &dummy;
      int result_invalid = SafeFetch32(p_invalid, 0xABC);
      assert(result_invalid == 0xABC, "SafeFetch32 error");
      int result_valid = SafeFetch32(p_valid, 0xABC);
      assert(result_valid == 17, "SafeFetch32 error");
*** 256,266 ****
  #else
      const intptr_t v1 = 0xABCDABCD;
      const intptr_t v2 = 0xDEFDDEFD;
  #endif
      intptr_t dummy = v1;
!     intptr_t* const p_invalid = (intptr_t*) get_segfault_address();
      intptr_t* const p_valid = &dummy;
      intptr_t result_invalid = SafeFetchN(p_invalid, v2);
      assert(result_invalid == v2, "SafeFetchN error");
      intptr_t result_valid = SafeFetchN(p_valid, v2);
      assert(result_valid == v1, "SafeFetchN error");
--- 257,267 ----
  #else
      const intptr_t v1 = 0xABCDABCD;
      const intptr_t v2 = 0xDEFDDEFD;
  #endif
      intptr_t dummy = v1;
!     intptr_t* const p_invalid = (intptr_t*) VMError::get_segfault_address();
      intptr_t* const p_valid = &dummy;
      intptr_t result_invalid = SafeFetchN(p_invalid, v2);
      assert(result_invalid == v2, "SafeFetchN error");
      intptr_t result_valid = SafeFetchN(p_valid, v2);
      assert(result_valid == v1, "SafeFetchN error");