--- a/hotspot/src/share/vm/asm/codeBuffer.cpp	Tue May 16 19:36:55 2017 -0400
+++ b/hotspot/src/share/vm/asm/codeBuffer.cpp	Wed May 17 11:41:08 2017 +0200
@@ -623,9 +623,7 @@
 }
 
 csize_t CodeBuffer::total_relocation_size() const {
-  csize_t lsize = copy_relocations_to(NULL);  // dry run only
-  csize_t csize = total_content_size();
-  csize_t total = RelocIterator::locs_and_index_size(csize, lsize);
+  csize_t total = copy_relocations_to(NULL);  // dry run only
   return (csize_t) align_size_up(total, HeapWordSize);
 }
 
@@ -726,13 +724,6 @@
   //
   buf_offset = copy_relocations_to(buf, buf_limit, false);
 
-  // Account for index:
-  if (buf != NULL) {
-    RelocIterator::create_index(dest->relocation_begin(),
-                                buf_offset / sizeof(relocInfo),
-                                dest->relocation_end());
-  }
-
   return buf_offset;
 }