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

*** 173,190 ****
    // 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(InCSetState const state,
                                    InCSetState* dest,
                                    size_t word_sz,
-                                   AllocationContext_t const context,
                                    bool previous_plab_refill_failed);
  
    inline InCSetState next_state(InCSetState const state, markOop const m, uint& age);
  
    void report_promotion_event(InCSetState const dest_state,
                                oop const old, size_t word_sz, uint age,
!                               HeapWord * const obj_ptr, const AllocationContext_t context) const;
   public:
  
    oop copy_to_survivor_space(InCSetState const state, oop const obj, markOop const old_mark);
  
    void trim_queue();
--- 173,189 ----
    // 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(InCSetState const state,
                                    InCSetState* dest,
                                    size_t word_sz,
                                    bool previous_plab_refill_failed);
  
    inline InCSetState next_state(InCSetState const state, markOop const m, uint& age);
  
    void report_promotion_event(InCSetState const dest_state,
                                oop const old, size_t word_sz, uint age,
!                               HeapWord * const obj_ptr) const;
   public:
  
    oop copy_to_survivor_space(InCSetState const state, oop const obj, markOop const old_mark);
  
    void trim_queue();