src/share/vm/memory/metaspace.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -3371,11 +3371,11 @@
     }
 #endif // INCLUDE_CDS
 
 #ifdef _LP64
     if (!UseSharedSpaces && using_class_space()) {
-      char* base = (char*)align_ptr_up(Universe::heap()->reserved_region().end(), _reserve_alignment);
+      char* base = (char*)align_ptr_up(GC::gc()->heap()->reserved_region().end(), _reserve_alignment);
       allocate_metaspace_compressed_klass_ptrs(base, 0);
     }
 #endif // _LP64
 
     // Initialize these before initializing the VirtualSpaceList

@@ -3624,11 +3624,11 @@
     // Allocation failed.
     if (is_init_completed()) {
       // Only start a GC if the bootstrapping has completed.
 
       // Try to clean out some memory and retry.
-      result = Universe::heap()->collector_policy()->satisfy_failed_metadata_allocation(
+      result = GC::gc()->heap()->collector_policy()->satisfy_failed_metadata_allocation(
           loader_data, word_size, mdtype);
     }
   }
 
   if (result == NULL) {