--- a/hotspot/src/cpu/x86/vm/x86_64.ad	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad	Thu Apr 13 09:57:51 2017 +0200
@@ -579,7 +579,7 @@
 {
   current_offset += clear_avx_size(); // skip vzeroupper
   current_offset += 1; // skip call opcode byte
-  return round_to(current_offset, alignment_required()) - current_offset;
+  return align_up(current_offset, alignment_required()) - current_offset;
 }
 
 // The address of the call instruction needs to be 4-byte aligned to
@@ -588,7 +588,7 @@
 {
   current_offset += clear_avx_size(); // skip vzeroupper
   current_offset += 11; // skip movq instruction + call opcode byte
-  return round_to(current_offset, alignment_required()) - current_offset;
+  return align_up(current_offset, alignment_required()) - current_offset;
 }
 
 // EMIT_RM()
@@ -2807,7 +2807,7 @@
   // Ret Addr is on stack in slot 0 if no locks or verification or alignment.
   // Otherwise, it is above the locks and verification slot and alignment word
   return_addr(STACK - 2 +
-              round_to((Compile::current()->in_preserve_stack_slots() +
+              align_up((Compile::current()->in_preserve_stack_slots() +
                         Compile::current()->fixed_slots()),
                        stack_alignment_in_slots()));