Merge
authorkbarrett
Tue, 24 Nov 2015 08:29:48 +0000
changeset 34270 975f662da030
parent 34268 49c7439351d6 (current diff)
parent 34269 7c558c120803 (diff)
child 34271 b2bbfc960e8f
Merge
--- a/hotspot/src/share/vm/gc/g1/g1RemSet.hpp	Tue Nov 24 06:37:12 2015 +0000
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.hpp	Tue Nov 24 08:29:48 2015 +0000
@@ -54,16 +54,6 @@
   uint n_workers();
 
 protected:
-  enum SomePrivateConstants {
-    UpdateRStoMergeSync  = 0,
-    MergeRStoDoDirtySync = 1,
-    DoDirtySync          = 2,
-    LastSync             = 3,
-
-    SeqTask              = 0,
-    NumSeqTasks          = 1
-  };
-
   CardTableModRefBS*     _ct_bs;
   G1CollectorPolicy*     _g1p;
 
@@ -123,7 +113,6 @@
 
   // Record, if necessary, the fact that *p (where "p" is in region "from",
   // which is required to be non-NULL) has changed to a new non-NULL value.
-  template <class T> void write_ref(HeapRegion* from, T* p);
   template <class T> void par_write_ref(HeapRegion* from, T* p, uint tid);
 
   // Requires "region_bm" and "card_bm" to be bitmaps with 1 bit per region
--- a/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Tue Nov 24 06:37:12 2015 +0000
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Tue Nov 24 08:29:48 2015 +0000
@@ -35,11 +35,6 @@
 }
 
 template <class T>
-inline void G1RemSet::write_ref(HeapRegion* from, T* p) {
-  par_write_ref(from, p, 0);
-}
-
-template <class T>
 inline void G1RemSet::par_write_ref(HeapRegion* from, T* p, uint tid) {
   oop obj = oopDesc::load_decode_heap_oop(p);
   if (obj == NULL) {