src/share/vm/gc_interface/collectedHeap.cpp

*** 218,227 ****
--- 218,232 ----
      default:
        ShouldNotReachHere(); // Unexpected use of this function
    }
  }
  
+ void CollectedHeap::set_barrier_set(BarrierSet* barrier_set) {
+   _barrier_set = barrier_set;
+   oopDesc::set_bs(_barrier_set);
+ }
+ 
  void CollectedHeap::pre_initialize() {
    // Used for ReduceInitialCardMarks (when COMPILER2 is used);
    // otherwise remains unused.
  #ifdef COMPILER2
    _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()