src/hotspot/os/posix/vmError_posix.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2017, 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) 2003, 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.
*** 21,31 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "memory/filemap.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/os.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/vmError.hpp"
  
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
! #include "memory/metaspaceShared.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/os.hpp"
  #include "runtime/thread.hpp"
  #include "utilities/vmError.hpp"
  
*** 151,162 ****
    if (siginfo && UseSharedSpaces) {
      const siginfo_t* const si = (siginfo_t*)siginfo;
      if (si->si_signo == SIGBUS || si->si_signo == SIGSEGV) {
        const void* const fault_addr = si->si_addr;
        if (fault_addr != NULL) {
!         FileMapInfo* const mapinfo = FileMapInfo::current_info();
!         if (mapinfo->is_in_shared_space(fault_addr)) {
            st->print("Error accessing class data sharing archive. "
              "Mapped file inaccessible during execution, possible disk/network problem.");
          }
        }
      }
--- 151,161 ----
    if (siginfo && UseSharedSpaces) {
      const siginfo_t* const si = (siginfo_t*)siginfo;
      if (si->si_signo == SIGBUS || si->si_signo == SIGSEGV) {
        const void* const fault_addr = si->si_addr;
        if (fault_addr != NULL) {
!         if (MetaspaceShared::is_in_shared_metaspace(fault_addr)) {
            st->print("Error accessing class data sharing archive. "
              "Mapped file inaccessible during execution, possible disk/network problem.");
          }
        }
      }