src/share/vm/gc/cms/parOopClosures.inline.hpp

rev 8362 : [mq]: hotspot

*** 20,37 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
  
! #include "gc_implementation/parNew/parNewGeneration.hpp"
! #include "gc_implementation/parNew/parOopClosures.hpp"
! #include "memory/cardTableRS.hpp"
! #include "memory/genCollectedHeap.hpp"
! #include "memory/genOopClosures.inline.hpp"
  
  template <class T> inline void ParScanWeakRefClosure::do_oop_work(T* p) {
    assert (!oopDesc::is_null(*p), "null weak reference?");
    oop obj = oopDesc::load_decode_heap_oop_not_null(p);
    // weak references are sometimes scanned twice; must check
--- 20,37 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
! #define SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
  
! #include "gc/cms/parNewGeneration.hpp"
! #include "gc/cms/parOopClosures.hpp"
! #include "gc/shared/cardTableRS.hpp"
! #include "gc/shared/genCollectedHeap.hpp"
! #include "gc/shared/genOopClosures.inline.hpp"
  
  template <class T> inline void ParScanWeakRefClosure::do_oop_work(T* p) {
    assert (!oopDesc::is_null(*p), "null weak reference?");
    oop obj = oopDesc::load_decode_heap_oop_not_null(p);
    // weak references are sometimes scanned twice; must check
*** 141,146 ****
  inline void ParScanWithBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, true, false); }
  
  inline void ParScanWithoutBarrierClosure::do_oop_nv(oop* p)       { ParScanClosure::do_oop_work(p, false, false); }
  inline void ParScanWithoutBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP
--- 141,146 ----
  inline void ParScanWithBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, true, false); }
  
  inline void ParScanWithoutBarrierClosure::do_oop_nv(oop* p)       { ParScanClosure::do_oop_work(p, false, false); }
  inline void ParScanWithoutBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); }
  
! #endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP