--- a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp	Wed Sep 02 16:16:58 2015 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp	Wed Sep 02 11:41:42 2015 -0400
@@ -200,7 +200,7 @@
   // Otherwise, log it.
   G1SATBCardTableLoggingModRefBS* g1_bs =
     barrier_set_cast<G1SATBCardTableLoggingModRefBS>(G1CollectedHeap::heap()->barrier_set());
-  g1_bs->write_ref_field_work(field, new_val);
+  g1_bs->write_ref_field_work(field, new_val, false);
 }
 
 void

--- a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp	Wed Sep 02 16:16:58 2015 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.hpp	Wed Sep 02 11:41:42 2015 -0400
@@ -147,6 +147,10 @@
  private:
   G1SATBCardTableLoggingModRefBSChangedListener _listener;
   DirtyCardQueueSet& _dcqs;
+
+ protected:
+  virtual void write_ref_field_work(void* field, oop new_val, bool release);
+
  public:
   static size_t compute_size(size_t mem_region_size_in_words) {
     size_t number_of_slots = (mem_region_size_in_words / card_size_in_words);
@@ -165,8 +169,6 @@
 
   virtual void resize_covered_region(MemRegion new_region) { ShouldNotReachHere(); }
 
-  void write_ref_field_work(void* field, oop new_val, bool release = false);
-
   // Can be called from static contexts.
   static void write_ref_field_static(void* field, oop new_val);
 

--- a/hotspot/src/share/vm/gc/shared/barrierSet.hpp	Wed Sep 02 16:16:58 2015 +0200
+++ b/hotspot/src/share/vm/gc/shared/barrierSet.hpp	Wed Sep 02 11:41:42 2015 -0400
@@ -145,7 +145,7 @@
   // ...then the post-write version.
   inline void write_ref_field(void* field, oop new_val, bool release = false);
 protected:
-  virtual void write_ref_field_work(void* field, oop new_val, bool release = false) = 0;
+  virtual void write_ref_field_work(void* field, oop new_val, bool release) = 0;
 public:
 
   // Invoke the barrier, if any, necessary when writing the "bytes"-byte

--- a/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp	Wed Sep 02 16:16:58 2015 +0200
+++ b/hotspot/src/share/vm/gc/shared/cardTableModRefBS.hpp	Wed Sep 02 11:41:42 2015 -0400
@@ -183,7 +183,7 @@
   // these functions here for performance.
 
   void write_ref_field_work(oop obj, size_t offset, oop newVal);
-  virtual void write_ref_field_work(void* field, oop newVal, bool release = false);
+  virtual void write_ref_field_work(void* field, oop newVal, bool release);
 public:
 
   bool has_write_ref_array_opt() { return true; }

--- a/hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp	Wed Sep 02 16:16:58 2015 +0200
+++ b/hotspot/src/share/vm/gc/shared/modRefBarrierSet.hpp	Wed Sep 02 11:41:42 2015 -0400
@@ -60,7 +60,6 @@
     : BarrierSet(fake_rtti.add_tag(BarrierSet::ModRef)) { }
   ~ModRefBarrierSet() { }
 
-  virtual void write_ref_field_work(void* field, oop new_val, bool release = false) = 0;
 public:
   void write_prim_field(HeapWord* field, size_t bytes,
                         juint val1, juint val2) {}