equal
deleted
inserted
replaced
266 unsigned short alignment_in_bytes) { |
266 unsigned short alignment_in_bytes) { |
267 if (alignment_in_bytes <= ObjectAlignmentInBytes) { |
267 if (alignment_in_bytes <= ObjectAlignmentInBytes) { |
268 return addr; |
268 return addr; |
269 } |
269 } |
270 |
270 |
271 assert(is_ptr_aligned(addr, HeapWordSize), |
271 assert(is_aligned(addr, HeapWordSize), |
272 "Address " PTR_FORMAT " is not properly aligned.", p2i(addr)); |
272 "Address " PTR_FORMAT " is not properly aligned.", p2i(addr)); |
273 assert(is_size_aligned(alignment_in_bytes, HeapWordSize), |
273 assert(is_aligned(alignment_in_bytes, HeapWordSize), |
274 "Alignment size %u is incorrect.", alignment_in_bytes); |
274 "Alignment size %u is incorrect.", alignment_in_bytes); |
275 |
275 |
276 HeapWord* new_addr = align_ptr_up(addr, alignment_in_bytes); |
276 HeapWord* new_addr = align_up(addr, alignment_in_bytes); |
277 size_t padding = pointer_delta(new_addr, addr); |
277 size_t padding = pointer_delta(new_addr, addr); |
278 |
278 |
279 if (padding == 0) { |
279 if (padding == 0) { |
280 return addr; |
280 return addr; |
281 } |
281 } |