Automatic merge of jdk:master into master

Author: duke

src/hotspot/share/gc/shared/genCollectedHeap.cpp

@@ -488,11 +488,7 @@ void GenCollectedHeap::collect_generation(Generation* gen, bool full, size_t siz
       // collect() below will enable discovery as appropriate
     }
     gen->collect(full, clear_soft_refs, size, is_tlab);
-    if (!rp->enqueuing_is_done()) {
-      rp->disable_discovery();
-    } else {
-      rp->set_enqueuing_is_done(false);
-    }
+    rp->disable_discovery();
     rp->verify_no_references_recorded();
   }
 

src/hotspot/share/gc/shared/referenceProcessor.cpp

@@ -100,7 +100,6 @@ ReferenceProcessor::ReferenceProcessor(BoolObjectClosure* is_subject_to_discover
                                        BoolObjectClosure* is_alive_non_header)  :
   _is_subject_to_discovery(is_subject_to_discovery),
   _discovering_refs(false),
-  _enqueuing_is_done(false),
   _next_id(0),
   _is_alive_non_header(is_alive_non_header)
 {
@@ -199,7 +198,6 @@ ReferenceProcessorStats ReferenceProcessor::process_discovered_references(RefPro
 
   double start_time = os::elapsedTime();
 
-  assert(!enqueuing_is_done(), "If here enqueuing should not be complete");
   // Stop treating discovered references specially.
   disable_discovery();
 

src/hotspot/share/gc/shared/referenceProcessor.hpp

@@ -202,7 +202,6 @@ class ReferenceProcessor : public ReferenceDiscoverer {
                                         // other collectors in configuration
   bool        _discovery_is_mt;         // true if reference discovery is MT.
 
-  bool        _enqueuing_is_done;       // true if all weak references enqueued
   uint        _next_id;                 // round-robin mod _num_queues counter in
                                         // support of work distribution
 
@@ -405,10 +404,6 @@ class ReferenceProcessor : public ReferenceDiscoverer {
   // Whether we are in a phase when _processing_ is MT.
   bool processing_is_mt() const;
 
-  // whether all enqueueing of weak references is complete
-  bool enqueuing_is_done()  { return _enqueuing_is_done; }
-  void set_enqueuing_is_done(bool v) { _enqueuing_is_done = v; }
-
   // iterate over oops
   void weak_oops_do(OopClosure* f);       // weak roots