src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 12310 : [mq]: gcinterface.patch

@@ -1994,14 +1994,10 @@
   if (G1StringDedup::is_enabled()) {
     G1StringDedup::stop();
   }
 }
 
-size_t G1CollectedHeap::conservative_max_heap_alignment() {
-  return HeapRegion::max_region_size();
-}
-
 void G1CollectedHeap::post_initialize() {
   ref_processing_init();
 }
 
 void G1CollectedHeap::ref_processing_init() {

@@ -2687,11 +2683,11 @@
   const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
   gc_tracer->report_metaspace_summary(when, metaspace_summary);
 }
 
 G1CollectedHeap* G1CollectedHeap::heap() {
-  CollectedHeap* heap = Universe::heap();
+  CollectedHeap* heap = GC::gc()->heap();
   assert(heap != NULL, "Uninitialized access to G1CollectedHeap::heap()");
   assert(heap->kind() == CollectedHeap::G1CollectedHeap, "Not a G1CollectedHeap");
   return (G1CollectedHeap*)heap;
 }