diff src/share/vm/memory/modRefBarrierSet.hpp @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents 8a9bb7821e28
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/memory/modRefBarrierSet.hpp	Tue Mar 11 15:34:06 2014 +0100
+++ b/src/share/vm/memory/modRefBarrierSet.hpp	Wed Mar 12 13:30:08 2014 +0100
@@ -60,7 +60,7 @@
   void read_ref_field(void* field) {}
   void read_prim_field(HeapWord* field, size_t bytes) {}
 protected:
-  virtual void write_ref_field_work(void* field, oop new_val) = 0;
+  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) {}
@@ -72,7 +72,7 @@
   bool has_read_region_opt() { return false; }
 
 
-  // These operations should assert false unless the correponding operation
+  // These operations should assert false unless the corresponding operation
   // above returns true.
   void read_ref_array(MemRegion mr) {
     assert(false, "can't call");