src/share/vm/runtime/safepoint.cpp

rev 8362 : 8079792: GC directory structure cleanup
Reviewed-by:

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, 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, 2015, 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.
*** 28,40 ****
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
  #include "code/nmethod.hpp"
  #include "code/pcDesc.hpp"
  #include "code/scopeDesc.hpp"
! #include "gc_interface/collectedHeap.hpp"
  #include "interpreter/interpreter.hpp"
- #include "memory/gcLocker.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/atomic.inline.hpp"
--- 28,40 ----
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
  #include "code/nmethod.hpp"
  #include "code/pcDesc.hpp"
  #include "code/scopeDesc.hpp"
! #include "gc/shared/collectedHeap.hpp"
! #include "gc/shared/gcLocker.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/atomic.inline.hpp"
*** 54,65 ****
  #include "runtime/thread.inline.hpp"
  #include "services/runtimeService.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
! #include "gc_implementation/shared/suspendibleThreadSet.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
  
--- 54,65 ----
  #include "runtime/thread.inline.hpp"
  #include "services/runtimeService.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/cms/concurrentMarkSweepThread.hpp"
! #include "gc/g1/suspendibleThreadSet.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif