src/share/vm/aot/aotCodeHeap.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -525,11 +525,11 @@
 
 void AOTCodeHeap::link_global_lib_symbols() {
   if (!_lib_symbols_initialized) {
     _lib_symbols_initialized = true;
 
-    CollectedHeap* heap = Universe::heap();
+    CollectedHeap* heap = GC::gc()->heap();
     CardTableModRefBS* ct = (CardTableModRefBS*)(heap->barrier_set());
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_card_table_address", address, ct->byte_map_base);
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_top_address", address, (heap->supports_inline_contig_alloc() ? heap->top_addr() : NULL));
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_end_address", address, (heap->supports_inline_contig_alloc() ? heap->end_addr() : NULL));
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_polling_page", address, os::get_polling_page());