--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Nov 27 14:52:01 2014 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Nov 27 11:09:55 2014 +0100
@@ -2123,6 +2123,7 @@
   // We reclaimed old regions so we should calculate the sizes to make
   // sure we update the old gen/space data.
   g1h->g1mm()->update_sizes();
+  g1h->allocation_context_stats().update_after_mark();
 
   g1h->trace_heap_after_concurrent_cycle();
 }
@@ -3243,7 +3244,6 @@
   _g1h->set_par_threads(n_workers);
   _g1h->workers()->run_task(&g1_par_agg_task);
   _g1h->set_par_threads(0);
-  _g1h->allocation_context_stats().update_at_remark();
 }
 
 // Clear the per-worker arrays used to store the per-region counting data

--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp	Thu Nov 27 14:52:01 2014 +0400
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp	Thu Nov 27 11:09:55 2014 +0100
@@ -45,7 +45,7 @@
 public:
   inline void clear() { }
   inline void update(bool full_gc) { }
-  inline void update_at_remark() { }
+  inline void update_after_mark() { }
   inline bool available() { return false; }
 };