--- a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp	Sun May 07 16:42:03 2017 -0400
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp	Mon May 08 07:16:10 2017 -0400
@@ -157,8 +157,8 @@
   if (cl == NULL) return true;
   bool result = true;
   void** buf = BufferNode::make_buffer_from_node(node);
-  size_t limit = DirtyCardQueue::byte_index_to_index(buffer_size());
-  size_t i = DirtyCardQueue::byte_index_to_index(node->index());
+  size_t i = node->index();
+  size_t limit = buffer_size();
   for ( ; i < limit; ++i) {
     jbyte* card_ptr = static_cast<jbyte*>(buf[i]);
     assert(card_ptr != NULL, "invariant");
@@ -168,9 +168,8 @@
     }
   }
   if (consume) {
-    size_t new_index = DirtyCardQueue::index_to_byte_index(i);
-    assert(new_index <= buffer_size(), "invariant");
-    node->set_index(new_index);
+    assert(i <= buffer_size(), "invariant");
+    node->set_index(i);
   }
   return result;
 }