From f0e72fd707cd54d8bcfeae2c78f540aa63b60b26 Mon Sep 17 00:00:00 2001
From: tschatzl <unknown>
Date: Mon, 21 Jul 2014 09:59:37 +0200
Subject: [PATCH] 8049051: Use of during_initial_mark_pause() in
 G1CollectorPolicy::record_collection_pause_end() prevents use of seperate
 object copy time prediction during marking Summary: Replaced use of
 during_initial_mark_pause() with the variable
 last_pause_included_initial_mark that holds the real old value of
 _during_initial_mark_pause. Reviewed-by: brutisso, ehelin

---
 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index 02c91e969..cbeee6af4 100644
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -1046,7 +1046,7 @@ void G1CollectorPolicy::record_collection_pause_end(double pause_time_ms, Evacua
 
   bool new_in_marking_window = _in_marking_window;
   bool new_in_marking_window_im = false;
-  if (during_initial_mark_pause()) {
+  if (last_pause_included_initial_mark) {
     new_in_marking_window = true;
     new_in_marking_window_im = true;
   }
-- 
GitLab