--- a/hotspot/src/share/vm/opto/buildOopMap.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/opto/buildOopMap.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -566,7 +566,7 @@
   Arena *A = Thread::current()->resource_area();
   Block_List worklist;          // Worklist of pending blocks
 
-  int max_reg_ints = round_to(max_reg, BitsPerInt)>>LogBitsPerInt;
+  int max_reg_ints = align_up(max_reg, BitsPerInt)>>LogBitsPerInt;
   Dict *safehash = NULL;        // Used for assert only
   // Compute a backwards liveness per register.  Needs a bitarray of
   // #blocks x (#registers, rounded up to ints)