--- a/hotspot/src/share/vm/opto/memnode.cpp Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/opto/memnode.cpp Tue Jul 04 15:58:10 2017 +0200
@@ -3560,7 +3560,7 @@
intptr_t ti_limit = (TrackedInitializationLimit * HeapWordSize);
intptr_t size_limit = phase->find_intptr_t_con(size_in_bytes, ti_limit);
size_limit = MIN2(size_limit, ti_limit);
- size_limit = align_size_up(size_limit, BytesPerLong);
+ size_limit = align_up(size_limit, BytesPerLong);
int num_tiles = size_limit / BytesPerLong;
// allocate space for the tile map:
@@ -3791,7 +3791,7 @@
// update the map:
- intptr_t this_int_off = align_size_down(st_off, BytesPerInt);
+ intptr_t this_int_off = align_down(st_off, BytesPerInt);
if (this_int_off != int_map_off) {
// reset the map:
int_map = 0;
@@ -3805,7 +3805,7 @@
}
// Did this store hit or cross the word boundary?
- intptr_t next_int_off = align_size_down(st_off + st_size, BytesPerInt);
+ intptr_t next_int_off = align_down(st_off + st_size, BytesPerInt);
if (next_int_off == this_int_off + BytesPerInt) {
// We passed the current int, without fully initializing it.
int_map_off = next_int_off;
@@ -3895,7 +3895,7 @@
// zsize 0 0 0 0 4 0 4
if (next_full_store < 0) {
// Conservative tack: Zero to end of current word.
- zeroes_needed = align_size_up(zeroes_needed, BytesPerInt);
+ zeroes_needed = align_up(zeroes_needed, BytesPerInt);
} else {
// Zero to beginning of next fully initialized word.
// Or, don't zero at all, if we are already in that word.
@@ -3908,7 +3908,7 @@
if (zeroes_needed > zeroes_done) {
intptr_t zsize = zeroes_needed - zeroes_done;
// Do some incremental zeroing on rawmem, in parallel with inits.
- zeroes_done = align_size_down(zeroes_done, BytesPerInt);
+ zeroes_done = align_down(zeroes_done, BytesPerInt);
rawmem = ClearArrayNode::clear_memory(rawctl, rawmem, rawptr,
zeroes_done, zeroes_needed,
phase);
@@ -3941,7 +3941,7 @@
assert(st_off >= last_init_end, "tiles do not overwrite inits");
last_tile_end = MAX2(last_tile_end, next_init_off);
} else {
- intptr_t st_tile_end = align_size_up(next_init_off, BytesPerLong);
+ intptr_t st_tile_end = align_up(next_init_off, BytesPerLong);
assert(st_tile_end >= last_tile_end, "inits stay with tiles");
assert(st_off >= last_init_end, "inits do not overlap");
last_init_end = next_init_off; // it's a non-tile
@@ -3954,7 +3954,7 @@
if (!(UseTLAB && ZeroTLAB)) {
// If anything remains to be zeroed, zero it all now.
- zeroes_done = align_size_down(zeroes_done, BytesPerInt);
+ zeroes_done = align_down(zeroes_done, BytesPerInt);
// if it is the last unused 4 bytes of an instance, forget about it
intptr_t size_limit = phase->find_intptr_t_con(size_in_bytes, max_jint);
if (zeroes_done + BytesPerLong >= size_limit) {