diff -r fce1fa1bdc91 -r df6f2350edfa src/hotspot/share/gc/g1/g1ParScanThreadState.hpp --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp Wed Nov 13 10:49:12 2019 -0800 +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp Wed Nov 13 10:49:32 2019 -0800 @@ -187,22 +187,21 @@ inline void dispatch_reference(StarTask ref); // Tries to allocate word_sz in the PLAB of the next "generation" after trying to - // allocate into dest. State is the original (source) cset state for the object - // that is allocated for. Previous_plab_refill_failed indicates whether previously - // a PLAB refill into "state" failed. + // allocate into dest. Previous_plab_refill_failed indicates whether previous + // PLAB refill for the original (source) object failed. // Returns a non-NULL pointer if successful, and updates dest if required. // Also determines whether we should continue to try to allocate into the various // generations or just end trying to allocate. - HeapWord* allocate_in_next_plab(G1HeapRegionAttr const region_attr, - G1HeapRegionAttr* dest, + HeapWord* allocate_in_next_plab(G1HeapRegionAttr* dest, size_t word_sz, - bool previous_plab_refill_failed); + bool previous_plab_refill_failed, + uint node_index); inline G1HeapRegionAttr next_region_attr(G1HeapRegionAttr const region_attr, markWord const m, uint& age); void report_promotion_event(G1HeapRegionAttr const dest_attr, oop const old, size_t word_sz, uint age, - HeapWord * const obj_ptr) const; + HeapWord * const obj_ptr, uint node_index) const; inline bool needs_partial_trimming() const; inline bool is_partially_trimmed() const;