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

rev 9974 : 8146395: Add inline qualifier in oop.hpp and fix inlining in gc files
Summary: Fix remaining issues after 8146401. Also fix windows VS2010 linkage problem (g1OopClosures.hpp).

*** 1,7 ****
  /*
!  * Copyright (c) 2007, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2007, 2016, 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,52 ****
  #include "gc/cms/cmsOopClosures.hpp"
  #include "gc/cms/concurrentMarkSweepGeneration.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "oops/oop.inline.hpp"
  
- // Trim our work_queue so its length is below max at return
- inline void ParMarkRefsIntoAndScanClosure::trim_queue(uint max) {
-   while (_work_queue->size() > max) {
-     oop newOop;
-     if (_work_queue->pop_local(newOop)) {
-       assert(newOop->is_oop(), "Expected an oop");
-       assert(_bit_map->isMarked((HeapWord*)newOop),
-              "only grey objects on this stack");
-       // iterate over the oops in this oop, marking and pushing
-       // the ones in CMS heap (i.e. in _span).
-       newOop->oop_iterate(&_parPushAndMarkClosure);
-     }
-   }
- }
- 
  // MetadataAwareOopClosure and MetadataAwareOopsInGenClosure are duplicated,
  // until we get rid of OopsInGenClosure.
  
  inline void MetadataAwareOopsInGenClosure::do_klass_nv(Klass* k) {
    ClassLoaderData* cld = k->class_loader_data();
--- 28,37 ----
*** 59,64 ****
--- 44,93 ----
  
    bool claim = true;  // Must claim the class loader data before processing.
    cld->oops_do(_klass_closure._oop_closure, &_klass_closure, claim);
  }
  
+ // Decode the oop and call do_oop on it.
+ #define DO_OOP_WORK_IMPL(cls)                                 \
+   template <class T> void cls::do_oop_work(T* p) {            \
+     T heap_oop = oopDesc::load_heap_oop(p);                   \
+     if (!oopDesc::is_null(heap_oop)) {                        \
+       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);  \
+       do_oop(obj);                                            \
+     }                                                         \
+   }
+ 
+ #define DO_OOP_WORK_NV_IMPL(cls)                              \
+   DO_OOP_WORK_IMPL(cls)                                       \
+   void cls::do_oop_nv(oop* p)       { cls::do_oop_work(p); }  \
+   void cls::do_oop_nv(narrowOop* p) { cls::do_oop_work(p); }
+ 
+ DO_OOP_WORK_IMPL(MarkRefsIntoClosure)
+ DO_OOP_WORK_IMPL(ParMarkRefsIntoClosure)
+ DO_OOP_WORK_IMPL(MarkRefsIntoVerifyClosure)
+ DO_OOP_WORK_NV_IMPL(PushAndMarkClosure)
+ DO_OOP_WORK_NV_IMPL(ParPushAndMarkClosure)
+ DO_OOP_WORK_NV_IMPL(MarkRefsIntoAndScanClosure)
+ DO_OOP_WORK_NV_IMPL(ParMarkRefsIntoAndScanClosure)
+ 
+ // Trim our work_queue so its length is below max at return
+ inline void ParMarkRefsIntoAndScanClosure::trim_queue(uint max) {
+   while (_work_queue->size() > max) {
+     oop newOop;
+     if (_work_queue->pop_local(newOop)) {
+       assert(newOop->is_oop(), "Expected an oop");
+       assert(_bit_map->isMarked((HeapWord*)newOop),
+              "only grey objects on this stack");
+       // iterate over the oops in this oop, marking and pushing
+       // the ones in CMS heap (i.e. in _span).
+       newOop->oop_iterate(&_parPushAndMarkClosure);
+     }
+   }
+ }
+ 
+ DO_OOP_WORK_NV_IMPL(PushOrMarkClosure)
+ DO_OOP_WORK_NV_IMPL(ParPushOrMarkClosure)
+ DO_OOP_WORK_NV_IMPL(CMSKeepAliveClosure)
+ DO_OOP_WORK_NV_IMPL(CMSInnerParMarkAndPushClosure)
+ DO_OOP_WORK_IMPL(CMSParKeepAliveClosure)
+ 
  #endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP