--- a/hotspot/src/share/vm/code/exceptionHandlerTable.hpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/code/exceptionHandlerTable.hpp	Thu Apr 13 09:57:51 2017 +0200
@@ -114,7 +114,7 @@
   );
 
   // nmethod support
-  int  size_in_bytes() const { return round_to(_length * sizeof(HandlerTableEntry), oopSize); }
+  int  size_in_bytes() const { return align_up(_length * (int)sizeof(HandlerTableEntry), oopSize); }
   void copy_to(CompiledMethod* nm);
   void copy_bytes_to(address addr);