src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp

G1BarrierSet_merge

*** 39,50 ****
  #include "runtime/vframeArray.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/align.hpp"
  #include "vmreg_sparc.inline.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CardTable.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif
  
  // Implementation of StubAssembler
  
  int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) {
--- 39,50 ----
  #include "runtime/vframeArray.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/align.hpp"
  #include "vmreg_sparc.inline.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #endif
  
  // Implementation of StubAssembler
  
  int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) {
***************
*** 760,770 ****
  
  #if INCLUDE_ALL_GCS
      case g1_pre_barrier_slow_id:
        { // G4: previous value of memory
          BarrierSet* bs = Universe::heap()->barrier_set();
!         if (bs->kind() != BarrierSet::G1SATBCTLogging) {
            __ save_frame(0);
            __ set((int)id, O1);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), I0);
            __ should_not_reach_here();
            break;
--- 760,770 ----
  
  #if INCLUDE_ALL_GCS
      case g1_pre_barrier_slow_id:
        { // G4: previous value of memory
          BarrierSet* bs = Universe::heap()->barrier_set();
!         if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ save_frame(0);
            __ set((int)id, O1);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), I0);
            __ should_not_reach_here();
            break;
***************
*** 831,841 ****
        break;
  
      case g1_post_barrier_slow_id:
        {
          BarrierSet* bs = Universe::heap()->barrier_set();
!         if (bs->kind() != BarrierSet::G1SATBCTLogging) {
            __ save_frame(0);
            __ set((int)id, O1);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), I0);
            __ should_not_reach_here();
            break;
--- 831,841 ----
        break;
  
      case g1_post_barrier_slow_id:
        {
          BarrierSet* bs = Universe::heap()->barrier_set();
!         if (bs->kind() != BarrierSet::G1BarrierSet) {
            __ save_frame(0);
            __ set((int)id, O1);
            __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), I0);
            __ should_not_reach_here();
            break;