--- a/hotspot/src/share/vm/utilities/bitMap.hpp	Sat Apr 22 00:56:56 2017 +0000
+++ b/hotspot/src/share/vm/utilities/bitMap.hpp	Sun Apr 23 15:02:46 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -247,15 +247,6 @@
   // Looking for 1's and 0's at indices equal to or greater than "l_index",
   // stopping if none has been found before "r_index", and returning
   // "r_index" (which must be at most "size") in that case.
-  idx_t get_next_one_offset_inline (idx_t l_index, idx_t r_index) const;
-  idx_t get_next_zero_offset_inline(idx_t l_index, idx_t r_index) const;
-
-  // Like "get_next_one_offset_inline", except requires that "r_index" is
-  // aligned to bitsizeof(bm_word_t).
-  idx_t get_next_one_offset_inline_aligned_right(idx_t l_index,
-                                                        idx_t r_index) const;
-
-  // Non-inline versionsof the above.
   idx_t get_next_one_offset (idx_t l_index, idx_t r_index) const;
   idx_t get_next_zero_offset(idx_t l_index, idx_t r_index) const;
 
@@ -266,6 +257,10 @@
     return get_next_zero_offset(offset, size());
   }
 
+  // Like "get_next_one_offset", except requires that "r_index" is
+  // aligned to bitsizeof(bm_word_t).
+  idx_t get_next_one_offset_aligned_right(idx_t l_index, idx_t r_index) const;
+
   // Returns the number of bits set in the bitmap.
   idx_t count_one_bits() const;