*** old/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Tue Feb 11 11:34:03 2014
--- new/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Tue Feb 11 11:34:03 2014

*** 82,92 ****
--- 82,91 ----
  class HeapRegionSetBase VALUE_OBJ_CLASS_SPEC {
    friend class VMStructs;
  private:
    bool _is_humongous;
    bool _is_empty;
    bool _is_linked;
    HRSMtSafeChecker* _mt_safety_checker;
  
  protected:
    // The number of regions added to the set. If the set contains
    // only humongous regions, this reflects only 'starts humongous'

*** 107,128 ****
--- 106,125 ----
  
    // Indicates whether all regions in the set should be empty or
    // not. Only used during verification.
    bool regions_empty() { return _is_empty; }
  
    bool regions_linked() { return _is_linked; }
  
    bool check_mt_safety() {
      if (_mt_safety_checker != NULL) {
        _mt_safety_checker->check();
      }
      return true;
    }
  
    virtual void fill_in_ext_msg_extra(hrs_ext_msg* msg) { }
  
-   HeapRegionSetBase(const char* name, bool humongous, bool empty, bool linked, HRSMtSafeChecker* mt_safety_checker);
  
  public:
    const char* name() { return _name; }
  
    uint length() { return _count.length(); }

*** 190,200 ****
--- 187,197 ----
  // the same interface (namely, the HeapRegionSetBase API).
  
  class HeapRegionSet : public HeapRegionSetBase {
  public:
    HeapRegionSet(const char* name, bool humongous, HRSMtSafeChecker* mt_safety_checker):
-     HeapRegionSetBase(name, humongous, false /* empty */, false /* linked */, mt_safety_checker) { }
  
    void bulk_remove(const HeapRegionSetCount& removed) {
      _count.decrement(removed.length(), removed.capacity());
    }
  };

*** 222,232 ****
--- 219,229 ----
    // See the comment for HeapRegionSetBase::clear()
    virtual void clear();
  
  public:
    FreeRegionList(const char* name, HRSMtSafeChecker* mt_safety_checker):
-     HeapRegionSetBase(name, false /* humongous */, true /* empty */, true /* linked */, mt_safety_checker) {
      clear();
    }
  
    void verify_list();