--- old/src/hotspot/share/gc/serial/genMarkSweep.cpp	2020-08-07 13:16:01.278070348 +0200
+++ new/src/hotspot/share/gc/serial/genMarkSweep.cpp	2020-08-07 13:16:01.150068315 +0200
@@ -137,13 +137,8 @@
   // input to soft ref clearing policy at the next gc.
   Universe::update_heap_info_at_gc();
 
-  // Update time of last gc for all generations we collected
-  // (which currently is all the generations in the heap).
-  // We need to use a monotonically non-decreasing time in ms
-  // or we will see time-warp warnings and os::javaTimeMillis()
-  // does not guarantee monotonicity.
-  jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
-  gch->update_time_of_last_gc(now);
+  // Signal that we have completed a visit to all live objects.
+  Universe::heap()->record_whole_heap_examined_timestamp();
 
   gch->trace_heap_after_gc(_gc_tracer);
 }