src/cpu/x86/vm/c1_Runtime1_x86.cpp

rev 8396 : imported patch epsilon-base

*** 1701,1715 ****
  
      case g1_post_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
  
  
          // arg0: store_address
          Address store_addr(rbp, 2*BytesPerWord);
  
-         BarrierSet* bs = Universe::heap()->barrier_set();
          CardTableModRefBS* ct = (CardTableModRefBS*)bs;
          assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
  
          Label done;
          Label runtime;
--- 1701,1722 ----
  
      case g1_post_barrier_slow_id:
        {
          StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
  
+         BarrierSet* bs = Universe::heap()->barrier_set();
+         if (bs->kind() != BarrierSet::G1SATBCT &&
+             bs->kind() != BarrierSet::G1SATBCTLogging) {
+           __ movptr(rax, (int)id);
+           __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
+           __ should_not_reach_here();
+           break;
+         }
  
          // arg0: store_address
          Address store_addr(rbp, 2*BytesPerWord);
  
          CardTableModRefBS* ct = (CardTableModRefBS*)bs;
          assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
  
          Label done;
          Label runtime;