# HG changeset patch
# User ehelin
# Date 1448541790 -3600
# Node ID 31ee2fd5ae1d594aa861d0b37f82f806f75e9784
# Parent  586e90e84d60f355a9bd94e39dcc02ba6253408f
8144075: Move prepare_for_oops_into_collection_set_do into pre_evacuate_collection_set
Reviewed-by: mgerdin, tschatzl

diff -r 586e90e84d60 -r 31ee2fd5ae1d hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Thu Nov 26 09:50:22 2015 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Thu Nov 26 13:43:10 2015 +0100
@@ -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();)