--- old/src/share/vm/gc_interface/collectedHeap.cpp	2015-04-02 12:27:32.276335285 +0200
+++ new/src/share/vm/gc_interface/collectedHeap.cpp	2015-04-02 12:27:32.168335289 +0200
@@ -220,6 +220,11 @@
   }
 }
 
+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.