src/share/vm/memory/genCollectedHeap.cpp

@@ -116,11 +116,12 @@
   }
 
   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;
 
   ReservedSpace young_rs = heap_rs.first_part(gen_policy()->young_gen_spec()->max_size(), false, false);
   _young_gen = gen_policy()->young_gen_spec()->init(young_rs, 0, rem_set());