8325748: Serial: Move Generation::promote to TenuredGeneration

Reviewed-by: stefank

Author: albertnetymk

src/hotspot/share/gc/serial/generation.cpp

@@ -27,7 +27,6 @@
 #include "gc/serial/generation.hpp"
 #include "gc/serial/serialHeap.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
@@ -92,33 +91,3 @@ size_t Generation::max_contiguous_available() const {
   }
   return MAX2(avail, old_avail);
 }
-
-// Ignores "ref" and calls allocate().
-oop Generation::promote(oop obj, size_t obj_size) {
-  assert(obj_size == obj->size(), "bad obj_size passed in");
-
-#ifndef PRODUCT
-  if (SerialHeap::heap()->promotion_should_fail()) {
-    return nullptr;
-  }
-#endif  // #ifndef PRODUCT
-
-  // Allocate new object.
-  HeapWord* result = allocate(obj_size, false);
-  if (result == nullptr) {
-    // Promotion of obj into gen failed.  Try to expand and allocate.
-    result = expand_and_allocate(obj_size, false);
-    if (result == nullptr) {
-      return nullptr;
-    }
-  }
-
-  // Copy to new location.
-  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(obj), result, obj_size);
-  oop new_obj = cast_to_oop<HeapWord*>(result);
-
-  // Transform object if it is a stack chunk.
-  ContinuationGCSupport::transform_stack_chunk(new_obj);
-
-  return new_obj;
-}

src/hotspot/share/gc/serial/generation.hpp

@@ -142,15 +142,6 @@ class Generation: public CHeapObj<mtGC> {
   // Thread-local allocation buffers
   virtual bool supports_tlab_allocation() const { return false; }
 
-  // "obj" is the address of an object in a younger generation.  Allocate space
-  // for "obj" in the current (or some higher) generation, and copy "obj" into
-  // the newly allocated space, if possible, returning the result (or null if
-  // the allocation failed).
-  //
-  // The "obj_size" argument is just obj->size(), passed along so the caller can
-  // avoid repeating the virtual call to retrieve it.
-  virtual oop promote(oop obj, size_t obj_size);
-
   // Returns "true" iff collect() should subsequently be called on this
   // this generation. See comment below.
   // This is a generic implementation which can be overridden.

src/hotspot/share/gc/serial/tenuredGeneration.cpp

@@ -29,6 +29,7 @@
 #include "gc/serial/serialHeap.hpp"
 #include "gc/serial/tenuredGeneration.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
+#include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
@@ -413,6 +414,35 @@ bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes)
   return res;
 }
 
+oop TenuredGeneration::promote(oop obj, size_t obj_size) {
+  assert(obj_size == obj->size(), "bad obj_size passed in");
+
+#ifndef PRODUCT
+  if (SerialHeap::heap()->promotion_should_fail()) {
+    return nullptr;
+  }
+#endif  // #ifndef PRODUCT
+
+  // Allocate new object.
+  HeapWord* result = allocate(obj_size, false);
+  if (result == nullptr) {
+    // Promotion of obj into gen failed.  Try to expand and allocate.
+    result = expand_and_allocate(obj_size, false);
+    if (result == nullptr) {
+      return nullptr;
+    }
+  }
+
+  // Copy to new location.
+  Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(obj), result, obj_size);
+  oop new_obj = cast_to_oop<HeapWord*>(result);
+
+  // Transform object if it is a stack chunk.
+  ContinuationGCSupport::transform_stack_chunk(new_obj);
+
+  return new_obj;
+}
+
 void TenuredGeneration::collect(bool   full,
                                 bool   clear_all_soft_refs,
                                 size_t size,

src/hotspot/share/gc/serial/tenuredGeneration.hpp

@@ -160,6 +160,14 @@ class TenuredGeneration: public Generation {
   // might be attempted in the worst case.
   bool promotion_attempt_is_safe(size_t max_promoted_in_bytes) const;
 
+  // "obj" is the address of an object in young-gen.  Allocate space for "obj"
+  // in the old-gen, and copy "obj" into the newly allocated space, if
+  // possible, returning the result (or null if the allocation failed).
+  //
+  // The "obj_size" argument is just obj->size(), passed along so the caller can
+  // avoid repeating the virtual call to retrieve it.
+  oop promote(oop obj, size_t obj_size);
+
   virtual void verify();
   virtual void print_on(outputStream* st) const;
 };