diff -r a3919f5e8d2b -r 750c6edff33b hotspot/src/share/vm/interpreter/bytecode.hpp
--- a/hotspot/src/share/vm/interpreter/bytecode.hpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecode.hpp	Thu Apr 13 09:57:51 2017 +0200
@@ -44,7 +44,7 @@
   // Address computation
   address addr_at            (int offset)        const     { return (address)_bcp + offset; }
   u_char byte_at(int offset) const               { return *addr_at(offset); }
-  address aligned_addr_at    (int offset)        const     { return (address)round_to((intptr_t)addr_at(offset), jintSize); }
+  address aligned_addr_at    (int offset)        const     { return align_up(addr_at(offset), jintSize); }
 
   // Word access:
   int     get_Java_u2_at     (int offset)        const     { return Bytes::get_Java_u2(addr_at(offset)); }