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

rev 53920 : imported patch 8218880-g1-crashes-periodic-gc-gclocker
rev 53921 : [mq]: 8218880-shade-review
rev 53924 : imported patch 8219747-remove-g1-prefix
rev 53925 : imported patch 8219747-shade-review
rev 53926 : imported patch 8219748-add-and-use-timing-object
rev 53927 : [mq]: 8219856-spell-out-hetero

*** 1364,1374 ****
    void verify(VerifyOption vo);
  
    // WhiteBox testing support.
    virtual bool supports_concurrent_phase_control() const;
    virtual bool request_concurrent_phase(const char* phase);
!   bool is_hetero_heap() const;
  
    virtual WorkGang* get_safepoint_workers() { return _workers; }
  
    // The methods below are here for convenience and dispatch the
    // appropriate method depending on value of the given VerifyOption
--- 1364,1374 ----
    void verify(VerifyOption vo);
  
    // WhiteBox testing support.
    virtual bool supports_concurrent_phase_control() const;
    virtual bool request_concurrent_phase(const char* phase);
!   bool is_heterogeneous_heap() const;
  
    virtual WorkGang* get_safepoint_workers() { return _workers; }
  
    // The methods below are here for convenience and dispatch the
    // appropriate method depending on value of the given VerifyOption