truffle: src/share/vm/gc_interface/collectedHeap.inline.hpp comparison

Merge with jdk8u40-b25

author	Gilles Duboscq <gilles.m.duboscq@oracle.com>
date	Tue, 07 Apr 2015 14:58:49 +0200
parents	52b4284cb496 ee019285a52c
children

comparison

equal deleted inserted replaced

-:84105dcdb05b
+:7848fc12602b
 inline void CollectedHeap::oop_iterate_no_header(OopClosure* cl) {
 NoHeaderExtendedOopClosure no_header_cl(cl);
 oop_iterate(&no_header_cl);
 }
+inline HeapWord* CollectedHeap::align_allocation_or_fail(HeapWord* addr,
+HeapWord* end,
+unsigned short alignment_in_bytes) {
+if (alignment_in_bytes <= ObjectAlignmentInBytes) {
+return addr;
+}
+assert(is_ptr_aligned(addr, HeapWordSize),
+err_msg("Address " PTR_FORMAT " is not properly aligned.", p2i(addr)));
+assert(is_size_aligned(alignment_in_bytes, HeapWordSize),
+err_msg("Alignment size %u is incorrect.", alignment_in_bytes));
+HeapWord* new_addr = (HeapWord*) align_pointer_up(addr, alignment_in_bytes);
+size_t padding = pointer_delta(new_addr, addr);
+if (padding == 0) {
+return addr;
+}
+if (padding < CollectedHeap::min_fill_size()) {
+padding += alignment_in_bytes / HeapWordSize;
+assert(padding >= CollectedHeap::min_fill_size(),
+err_msg("alignment_in_bytes %u is expect to be larger "
+"than the minimum object size", alignment_in_bytes));
+new_addr = addr + padding;
+}
+assert(new_addr > addr, err_msg("Unexpected arithmetic overflow "
+PTR_FORMAT " not greater than " PTR_FORMAT, p2i(new_addr), p2i(addr)));
+if(new_addr < end) {
+CollectedHeap::fill_with_object(addr, padding);
+return new_addr;
+} else {
+return NULL;
+}
+}
 #ifndef PRODUCT
 inline bool
 CollectedHeap::promotion_should_fail(volatile size_t* count) {
 // Access to count is not atomic; the value does not have to be exact.

Mercurial > hg > truffle