--- a/hotspot/src/share/vm/memory/virtualspace.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/share/vm/memory/virtualspace.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -650,8 +650,8 @@
   _upper_alignment  = os::vm_page_size();
 
   // End of each region
-  _lower_high_boundary = (char*) round_to((intptr_t) low_boundary(), middle_alignment());
-  _middle_high_boundary = (char*) round_down((intptr_t) high_boundary(), middle_alignment());
+  _lower_high_boundary = align_up(low_boundary(), middle_alignment());
+  _middle_high_boundary = align_down(high_boundary(), middle_alignment());
   _upper_high_boundary = high_boundary();
 
   // High address of each region
@@ -812,9 +812,9 @@
   // alignment will always be default page size.  middle alignment will be
   // LargePageSizeInBytes if the actual size of the virtual space is in
   // fact larger than LargePageSizeInBytes.
-  char* aligned_lower_new_high =  (char*) round_to((intptr_t) unaligned_lower_new_high, lower_alignment());
-  char* aligned_middle_new_high = (char*) round_to((intptr_t) unaligned_middle_new_high, middle_alignment());
-  char* aligned_upper_new_high =  (char*) round_to((intptr_t) unaligned_upper_new_high, upper_alignment());
+  char* aligned_lower_new_high =  align_up(unaligned_lower_new_high, lower_alignment());
+  char* aligned_middle_new_high = align_up(unaligned_middle_new_high, middle_alignment());
+  char* aligned_upper_new_high =  align_up(unaligned_upper_new_high, upper_alignment());
 
   // Determine which regions need to grow in this expand_by call.
   // If you are growing in the lower region, high() must be in that
@@ -898,12 +898,9 @@
     MAX2(unaligned_new_high, low_boundary());
 
   // Align address to region's alignment
-  char* aligned_upper_new_high =
-    (char*) round_to((intptr_t) unaligned_upper_new_high, upper_alignment());
-  char* aligned_middle_new_high =
-    (char*) round_to((intptr_t) unaligned_middle_new_high, middle_alignment());
-  char* aligned_lower_new_high =
-    (char*) round_to((intptr_t) unaligned_lower_new_high, lower_alignment());
+  char* aligned_upper_new_high =  align_up(unaligned_upper_new_high, upper_alignment());
+  char* aligned_middle_new_high = align_up(unaligned_middle_new_high, middle_alignment());
+  char* aligned_lower_new_high =  align_up(unaligned_lower_new_high, lower_alignment());
 
   // Determine which regions need to shrink
   size_t upper_needs = 0;