--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -1228,8 +1228,7 @@
       // create handler if necessary
       if (handler_index < 0) {
         ResourceMark rm;
-        ptrdiff_t align_offset = (address)
-          round_to((intptr_t)_buffer, CodeEntryAlignment) - (address)_buffer;
+        ptrdiff_t align_offset = align_up(_buffer, CodeEntryAlignment) - (address)_buffer;
         CodeBuffer buffer((address)(_buffer + align_offset),
                           SignatureHandlerLibrary::buffer_size - align_offset);
         InterpreterRuntime::SignatureHandlerGenerator(method, &buffer).generate(fingerprint);