G1 classes often have a _g1h member to store a reference to G1CollectedHeap::heap() for convenience.

Some code, in addition to that member, still explicitly refers to G1CollectedHeap::heap(). Fix the code to use the member variable instead.

Also look that code uses g1h instead of "_g1" or "g1".