--- a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Thu Apr 13 09:57:51 2017 +0200
@@ -134,7 +134,7 @@
 // Also begin is one past last monitor.
 
 inline BasicObjectLock* frame::interpreter_frame_monitor_begin()       const  {
-  int rounded_vm_local_words = round_to(frame::interpreter_frame_vm_local_words, WordsPerLong);
+  int rounded_vm_local_words = align_up((int)frame::interpreter_frame_vm_local_words, WordsPerLong);
   return (BasicObjectLock *)fp_addr_at(-rounded_vm_local_words);
 }
 
@@ -148,7 +148,7 @@
 }
 
 inline int frame::interpreter_frame_monitor_size() {
-  return round_to(BasicObjectLock::size(), WordsPerLong);
+  return align_up(BasicObjectLock::size(), WordsPerLong);
 }
 
 inline Method** frame::interpreter_frame_method_addr() const {