--- old/src/share/vm/gc_implementation/g1/g1Allocator.cpp	2014-12-15 12:59:10.887718694 +0100
+++ new/src/share/vm/gc_implementation/g1/g1Allocator.cpp	2014-12-15 12:59:10.829716955 +0100
@@ -150,11 +150,11 @@
 }
 
 void G1DefaultParGCAllocator::retire_alloc_buffers() {
-  for (uint i = 0; i < InCSetState::Num; i += 1) {
-    G1ParGCAllocBuffer* const buf = _alloc_buffers[i];
+  for (uint state = 0; state < InCSetState::Num; state += 1) {
+    G1ParGCAllocBuffer* const buf = _alloc_buffers[state];
     if (buf != NULL) {
       add_to_alloc_buffer_waste(buf->words_remaining());
-      buf->flush_stats_and_retire(_g1h->alloc_buffer_stats(i),
+      buf->flush_stats_and_retire(_g1h->alloc_buffer_stats(state),
                                   true /* end_of_gc */,
                                   false /* retain */);
     }