8144075: Move prepare_for_oops_into_collection_set_do into pre_evacuate_collection_set
Reviewed-by: mgerdin, tschatzl
diff --git a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
index 2511cc2..6bd9ce5 100644
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
@@ -5121,11 +5121,10 @@
hot_card_cache->reset_hot_cache_claimed_index();
hot_card_cache->set_use_cache(false);
+ g1_rem_set()->prepare_for_oops_into_collection_set_do();
}
void G1CollectedHeap::evacuate_collection_set(EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
- g1_rem_set()->prepare_for_oops_into_collection_set_do();
-
// Should G1EvacuationFailureALot be in effect for this GC?
NOT_PRODUCT(set_evacuation_failure_alot_for_current_gc();)
