src/share/vm/jvmci/jvmciCompilerToVM.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -178,33 +178,33 @@
   SharedRuntime_deopt_blob_unpack = SharedRuntime::deopt_blob()->unpack();
   SharedRuntime_deopt_blob_uncommon_trap = SharedRuntime::deopt_blob()->uncommon_trap();
 
   ThreadLocalAllocBuffer_alignment_reserve = ThreadLocalAllocBuffer::alignment_reserve();
 
-  Universe_collectedHeap = Universe::heap();
+  Universe_collectedHeap = GC::gc()->heap();
   Universe_base_vtable_size = Universe::base_vtable_size();
   Universe_narrow_oop_base = Universe::narrow_oop_base();
   Universe_narrow_oop_shift = Universe::narrow_oop_shift();
   Universe_narrow_klass_base = Universe::narrow_klass_base();
   Universe_narrow_klass_shift = Universe::narrow_klass_shift();
   Universe_non_oop_bits = Universe::non_oop_word();
   Universe_verify_oop_mask = Universe::verify_oop_mask();
   Universe_verify_oop_bits = Universe::verify_oop_bits();
 
-  _supports_inline_contig_alloc = Universe::heap()->supports_inline_contig_alloc();
-  _heap_end_addr = _supports_inline_contig_alloc ? Universe::heap()->end_addr() : (HeapWord**) -1;
-  _heap_top_addr = _supports_inline_contig_alloc ? Universe::heap()->top_addr() : (HeapWord* volatile*) -1;
+  _supports_inline_contig_alloc = GC::gc()->heap()->supports_inline_contig_alloc();
+  _heap_end_addr = _supports_inline_contig_alloc ? GC::gc()->heap()->end_addr() : (HeapWord**) -1;
+  _heap_top_addr = _supports_inline_contig_alloc ? GC::gc()->heap()->top_addr() : (HeapWord* volatile*) -1;
 
   _max_oop_map_stack_offset = (OopMapValue::register_mask - VMRegImpl::stack2reg(0)->value()) * VMRegImpl::stack_slot_size;
   int max_oop_map_stack_index = _max_oop_map_stack_offset / VMRegImpl::stack_slot_size;
   assert(OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index)), "should be valid");
   assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
 
   symbol_init = (address) vmSymbols::object_initializer_name();
   symbol_clinit = (address) vmSymbols::class_initializer_name();
 
-  BarrierSet* bs = Universe::heap()->barrier_set();
+  BarrierSet* bs = GC::gc()->heap()->barrier_set();
   switch (bs->kind()) {
   case BarrierSet::CardTableModRef:
   case BarrierSet::CardTableForRS:
   case BarrierSet::CardTableExtension:
   case BarrierSet::G1SATBCT: