8283188: Build time regression caused by JDK-8278917

Reviewed-by: kbarrett, tschatzl

Author: albertnetymk

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

@@ -3313,6 +3313,13 @@ HeapRegion* G1CollectedHeap::alloc_highest_free_region() {
   return NULL;
 }
 
+void G1CollectedHeap::mark_evac_failure_object(const oop obj, uint worker_id) const {
+  // All objects failing evacuation are live. What we'll do is
+  // that we'll update the prev marking info so that they are
+  // all under PTAMS and explicitly marked.
+  _cm->par_mark_in_prev_bitmap(obj);
+}
+
 // Optimized nmethod scanning
 
 class RegisterNMethodOopClosure: public OopClosure {

src/hotspot/share/gc/g1/g1CollectedHeap.hpp

@@ -1249,7 +1249,7 @@ class G1CollectedHeap : public CollectedHeap {
   inline bool is_obj_dead_full(const oop obj) const;
 
   // Mark the live object that failed evacuation in the prev bitmap.
-  inline void mark_evac_failure_object(const oop obj, uint worker_id) const;
+  void mark_evac_failure_object(const oop obj, uint worker_id) const;
 
   G1ConcurrentMark* concurrent_mark() const { return _cm; }
 

src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp

@@ -29,7 +29,6 @@
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectorState.hpp"
-#include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RemSet.hpp"
@@ -234,13 +233,6 @@ inline bool G1CollectedHeap::is_obj_dead_full(const oop obj) const {
     return is_obj_dead_full(obj, heap_region_containing(obj));
 }
 
-inline void G1CollectedHeap::mark_evac_failure_object(const oop obj, uint worker_id) const {
-  // All objects failing evacuation are live. What we'll do is
-  // that we'll update the prev marking info so that they are
-  // all under PTAMS and explicitly marked.
-  _cm->par_mark_in_prev_bitmap(obj);
-}
-
 inline void G1CollectedHeap::set_humongous_reclaim_candidate(uint region, bool value) {
   assert(_hrm.at(region)->is_starts_humongous(), "Must start a humongous object");
   _humongous_reclaim_candidates.set_candidate(region, value);