src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

@@ -2126,10 +2126,11 @@
     }
   }
 }
 
 #ifndef PRODUCT
+
 class CheckGCTimeStampsHRClosure : public HeapRegionClosure {
 private:
   unsigned _gc_time_stamp;
   bool _failures;
 

@@ -3334,12 +3335,10 @@
   heap_region_iterate(&cl);
 }
 #endif // PRODUCT
 
 G1CollectedHeap* G1CollectedHeap::heap() {
-  assert(_sh->kind() == CollectedHeap::G1CollectedHeap,
-         "not a garbage-first heap");
   return _g1h;
 }
 
 void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
   // always_do_update_barrier = false;

@@ -6159,12 +6158,10 @@
                            "done waiting for free regions");
   }
 }
 
 void G1CollectedHeap::set_region_short_lived_locked(HeapRegion* hr) {
-  assert(heap_lock_held_for_gc(),
-              "the heap lock should already be held by or for this thread");
   _young_list->push_region(hr);
 }
 
 class NoYoungRegionsClosure: public HeapRegionClosure {
 private: