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

rev 53581 : [mq]: move_files
rev 53582 : imported patch rename

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2018, 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) 2012, 2019, 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.
*** 21,34 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.inline.hpp"
  #include "gc/g1/g1EvacFailure.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1_globals.hpp"
  #include "gc/g1/heapRegion.hpp"
--- 21,34 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.inline.hpp"
+ #include "gc/g1/g1DirtyCardQueue.hpp"
  #include "gc/g1/g1EvacFailure.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1_globals.hpp"
  #include "gc/g1/heapRegion.hpp"
*** 39,53 ****
  #include "oops/oop.inline.hpp"
  
  class UpdateRSetDeferred : public BasicOopIterateClosure {
  private:
    G1CollectedHeap* _g1h;
!   DirtyCardQueue* _dcq;
    G1CardTable*    _ct;
  
  public:
!   UpdateRSetDeferred(DirtyCardQueue* dcq) :
      _g1h(G1CollectedHeap::heap()), _dcq(dcq), _ct(_g1h->card_table()) {}
  
    virtual void do_oop(narrowOop* p) { do_oop_work(p); }
    virtual void do_oop(      oop* p) { do_oop_work(p); }
    template <class T> void do_oop_work(T* p) {
--- 39,53 ----
  #include "oops/oop.inline.hpp"
  
  class UpdateRSetDeferred : public BasicOopIterateClosure {
  private:
    G1CollectedHeap* _g1h;
!   G1DirtyCardQueue* _dcq;
    G1CardTable*    _ct;
  
  public:
!   UpdateRSetDeferred(G1DirtyCardQueue* dcq) :
      _g1h(G1CollectedHeap::heap()), _dcq(dcq), _ct(_g1h->card_table()) {}
  
    virtual void do_oop(narrowOop* p) { do_oop_work(p); }
    virtual void do_oop(      oop* p) { do_oop_work(p); }
    template <class T> void do_oop_work(T* p) {
*** 194,204 ****
  class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure {
    G1CollectedHeap* _g1h;
    uint _worker_id;
    HeapRegionClaimer* _hrclaimer;
  
!   DirtyCardQueue _dcq;
    UpdateRSetDeferred _update_rset_cl;
  
  public:
    RemoveSelfForwardPtrHRClosure(uint worker_id,
                                  HeapRegionClaimer* hrclaimer) :
--- 194,204 ----
  class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure {
    G1CollectedHeap* _g1h;
    uint _worker_id;
    HeapRegionClaimer* _hrclaimer;
  
!   G1DirtyCardQueue _dcq;
    UpdateRSetDeferred _update_rset_cl;
  
  public:
    RemoveSelfForwardPtrHRClosure(uint worker_id,
                                  HeapRegionClaimer* hrclaimer) :