--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-01 13:07:13.907844941 +0200
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2015-04-01 13:07:13.783844946 +0200
@@ -1854,7 +1854,8 @@
     = new G1SATBCardTableLoggingModRefBS(reserved_region());
   bs->initialize();
   assert(bs->is_a(BarrierSet::G1SATBCTLogging), "sanity");
-  set_barrier_set(bs);
+  _barrier_set = bs;
+  oopDesc::set_bs(bs);
 
   // Also create a G1 rem set.
   _g1_rem_set = new G1RemSet(this, g1_barrier_set());
--- old/src/share/vm/memory/genCollectedHeap.cpp	2015-04-01 13:07:14.167844930 +0200
+++ new/src/share/vm/memory/genCollectedHeap.cpp	2015-04-01 13:07:14.051844935 +0200
@@ -118,7 +118,8 @@
   initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
 
   _rem_set = collector_policy()->create_rem_set(reserved_region());
-  set_barrier_set(rem_set()->bs());
+  _barrier_set = rem_set()->bs();
+  oopDesc::set_bs(_barrier_set);
 
   _gch = this;
 
--- old/src/share/vm/memory/sharedHeap.cpp	2015-04-01 13:07:14.383844921 +0200
+++ new/src/share/vm/memory/sharedHeap.cpp	2015-04-01 13:07:14.271844926 +0200
@@ -70,12 +70,6 @@
   Threads::assert_all_threads_claimed();
 }
 
-void SharedHeap::set_barrier_set(BarrierSet* bs) {
-  _barrier_set = bs;
-  // Cached barrier set for fast access in oops
-  oopDesc::set_bs(bs);
-}
-
 void SharedHeap::post_initialize() {
   CollectedHeap::post_initialize();
   ref_processing_init();
--- old/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:07:14.575844913 +0200
+++ new/src/share/vm/memory/sharedHeap.hpp	2015-04-01 13:07:14.467844917 +0200
@@ -113,8 +113,6 @@
   SharedHeap();
 
 public:
-  void set_barrier_set(BarrierSet* bs);
-
   // Does operations required after initialization has been done.
   virtual void post_initialize();