src/share/vm/gc/cms/promotionInfo.cpp

rev 9978 : 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).
Reviewed-by: stefank, mgerdin

*** 1,7 ****
  /*
!  * Copyright (c) 2010, 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) 2010, 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.
*** 32,41 ****
--- 32,66 ----
  /////////////////////////////////////////////////////////////////////////
  //// PromotionInfo
  /////////////////////////////////////////////////////////////////////////
  
  
+ PromotedObject* PromotedObject::next() const {
+   assert(!((FreeChunk*)this)->is_free(), "Error");
+   PromotedObject* res;
+   if (UseCompressedOops) {
+     // The next pointer is a compressed oop stored in the top 32 bits
+     res = (PromotedObject*)oopDesc::decode_heap_oop(_data._narrow_next);
+   } else {
+     res = (PromotedObject*)(_next & next_mask);
+   }
+   assert(oop(res)->is_oop_or_null(true /* ignore mark word */), "Expected an oop or NULL at " PTR_FORMAT, p2i(oop(res)));
+   return res;
+ }
+ 
+ inline void PromotedObject::setNext(PromotedObject* x) {
+   assert(((intptr_t)x & ~next_mask) == 0, "Conflict in bit usage, "
+          "or insufficient alignment of objects");
+   if (UseCompressedOops) {
+     assert(_data._narrow_next == 0, "Overwrite?");
+     _data._narrow_next = oopDesc::encode_heap_oop(oop(x));
+   } else {
+     _next |= (intptr_t)x;
+   }
+   assert(!((FreeChunk*)this)->is_free(), "Error");
+ }
+ 
  //////////////////////////////////////////////////////////////////////////////
  // We go over the list of promoted objects, removing each from the list,
  // and applying the closure (this may, in turn, add more elements to
  // the tail of the promoted list, and these newly added objects will
  // also be processed) until the list is empty.