src/share/vm/gc_implementation/g1/concurrentMark.cpp

rev 7807 : [mq]: bcast

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, 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) 2001, 2015, 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.
*** 1438,1448 ****
  
  public:
    CMCountDataClosureBase(G1CollectedHeap* g1h,
                           BitMap* region_bm, BitMap* card_bm):
      _g1h(g1h), _cm(g1h->concurrent_mark()),
!     _ct_bs((CardTableModRefBS*) (g1h->barrier_set())),
      _region_bm(region_bm), _card_bm(card_bm) { }
  };
  
  // Closure that calculates the # live objects per region. Used
  // for verification purposes during the cleanup pause.
--- 1438,1448 ----
  
  public:
    CMCountDataClosureBase(G1CollectedHeap* g1h,
                           BitMap* region_bm, BitMap* card_bm):
      _g1h(g1h), _cm(g1h->concurrent_mark()),
!     _ct_bs(barrier_set_cast<CardTableModRefBS>(g1h->barrier_set())),
      _region_bm(region_bm), _card_bm(card_bm) { }
  };
  
  // Closure that calculates the # live objects per region. Used
  // for verification purposes during the cleanup pause.
*** 3109,3119 ****
   public:
    AggregateCountDataHRClosure(G1CollectedHeap* g1h,
                                BitMap* cm_card_bm,
                                uint max_worker_id) :
      _g1h(g1h), _cm(g1h->concurrent_mark()),
!     _ct_bs((CardTableModRefBS*) (g1h->barrier_set())),
      _cm_card_bm(cm_card_bm), _max_worker_id(max_worker_id) { }
  
    bool doHeapRegion(HeapRegion* hr) {
      if (hr->is_continues_humongous()) {
        // We will ignore these here and process them when their
--- 3109,3119 ----
   public:
    AggregateCountDataHRClosure(G1CollectedHeap* g1h,
                                BitMap* cm_card_bm,
                                uint max_worker_id) :
      _g1h(g1h), _cm(g1h->concurrent_mark()),
!     _ct_bs(barrier_set_cast<CardTableModRefBS>(g1h->barrier_set())),
      _cm_card_bm(cm_card_bm), _max_worker_id(max_worker_id) { }
  
    bool doHeapRegion(HeapRegion* hr) {
      if (hr->is_continues_humongous()) {
        // We will ignore these here and process them when their