--- old/src/share/vm/gc/g1/dirtyCardQueue.cpp	2016-03-04 02:58:09.667960683 -0500
+++ new/src/share/vm/gc/g1/dirtyCardQueue.cpp	2016-03-04 02:58:09.575960226 -0500
@@ -125,26 +125,27 @@
 }
 
 bool DirtyCardQueue::apply_closure_to_buffer(CardTableEntryClosure* cl,
-                                             BufferNode* node, size_t sz,
+                                             BufferNode* node,
+                                             size_t buffer_size,
                                              bool consume,
                                              uint worker_i) {
   if (cl == NULL) return true;
   void** buf = BufferNode::make_buffer_from_node(node);
-  size_t limit = byte_index_to_index(sz);
+  size_t limit = byte_index_to_index(buffer_size);
   for (size_t i = byte_index_to_index(node->index()); i < limit; ++i) {
     jbyte* card_ptr = static_cast<jbyte*>(buf[i]);
     assert(card_ptr != NULL, "invariant");
     if (!cl->do_card_ptr(card_ptr, worker_i)) {
       if (consume) {
         size_t new_index = index_to_byte_index(i + 1);
-        assert(new_index <= sz, "invariant");
+        assert(new_index <= buffer_size, "invariant");
         node->set_index(new_index);
       }
       return false;
     }
   }
   if (consume) {
-    node->set_index(sz);
+    node->set_index(buffer_size);
   }
   return true;
 }