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

@@ -2155,18 +2155,10 @@
 void G1CollectedHeap::check_gc_time_stamps() {
   CheckGCTimeStampsHRClosure cl(_gc_time_stamp);
   heap_region_iterate(&cl);
   guarantee(!cl.failures(), "all GC time stamps should have been reset");
 }
-
-bool G1CollectedHeap::heap_lock_held_for_gc() {
-  Thread* t = Thread::current();
-  return    Heap_lock->owned_by_self()
-         || (   (t->is_GC_task_thread() ||  t->is_VM_thread())
-             && _thread_holds_heap_lock_for_gc);
-}
-
 #endif // PRODUCT
 
 void G1CollectedHeap::iterate_dirty_card_closure(CardTableEntryClosure* cl,
                                                  DirtyCardQueue* into_cset_dcq,
                                                  bool concurrent,

@@ -6166,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: