--- old/src/share/vm/gc/g1/g1BlockOffsetTable.cpp	2017-02-22 14:36:06.338757002 +0100
+++ new/src/share/vm/gc/g1/g1BlockOffsetTable.cpp	2017-02-22 14:36:06.214752180 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,9 +78,10 @@
   _bot(array),
   _space(gsp),
   _next_offset_threshold(NULL),
-  _next_offset_index(0),
-  _object_can_span(false)
-{ }
+  _next_offset_index(0)
+{
+  debug_only(_object_can_span = false;)
+}
 
 // The arguments follow the normal convention of denoting
 // a right-open interval: [start, end)
@@ -366,6 +367,10 @@
 }
 
 #ifndef PRODUCT
+void G1BlockOffsetTablePart::set_object_can_span(bool can_span) {
+  _object_can_span = can_span;
+}
+
 void
 G1BlockOffsetTablePart::print_on(outputStream* out) {
   size_t from_index = _bot->index_for(_space->bottom());
@@ -420,7 +425,3 @@
     alloc_block(obj_top, fill_size);
   }
 }
-
-void G1BlockOffsetTablePart::set_continues_humongous(bool is_humongous) {
-  _object_can_span = is_humongous;
-}