src/cpu/x86/vm/stubGenerator_x86_64.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -1193,11 +1193,11 @@
   //     tmp     - scratch register
   //
   //     Destroy no registers!
   //
   void  gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
-    BarrierSet* bs = Universe::heap()->barrier_set();
+    BarrierSet* bs = GC::gc()->heap()->barrier_set();
     switch (bs->kind()) {
       case BarrierSet::G1SATBCTLogging:
         // With G1, don't generate the call if we statically know that the target in uninitialized
         if (!dest_uninitialized) {
            __ pusha();                      // push registers

@@ -1237,11 +1237,11 @@
   //
   //  The input registers are overwritten.
   //
   void  gen_write_ref_array_post_barrier(Register start, Register count, Register scratch) {
     assert_different_registers(start, count, scratch);
-    BarrierSet* bs = Universe::heap()->barrier_set();
+    BarrierSet* bs = GC::gc()->heap()->barrier_set();
     switch (bs->kind()) {
       case BarrierSet::G1SATBCTLogging:
         {
           __ pusha();             // push registers (overkill)
           if (c_rarg0 == count) { // On win64 c_rarg0 == rcx