Mercurial > hg > graal-compiler

comparison src/share/vm/memory/allocation.cpp @ 14237:db1ff6781ab4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author morris
date Fri, 10 Jan 2014 12:54:08 -0800
parents ce86c36b8921 183bd5c00828
children abec000618bf
comparison
equal deleted inserted replaced
14196:c8907928a976 14237:db1ff6781ab4
137 137
138 #ifdef ASSERT 138 #ifdef ASSERT
139 void ResourceObj::set_allocation_type(address res, allocation_type type) { 139 void ResourceObj::set_allocation_type(address res, allocation_type type) {
140 // Set allocation type in the resource object 140 // Set allocation type in the resource object
141 uintptr_t allocation = (uintptr_t)res; 141 uintptr_t allocation = (uintptr_t)res;
142 assert((allocation & allocation_mask) == 0, "address should be aligned to 4 bytes at least"); 142 assert((allocation & allocation_mask) == 0, err_msg("address should be aligned to 4 bytes at least: " PTR_FORMAT, res));
143 assert(type <= allocation_mask, "incorrect allocation type"); 143 assert(type <= allocation_mask, "incorrect allocation type");
144 ResourceObj* resobj = (ResourceObj *)res; 144 ResourceObj* resobj = (ResourceObj *)res;
145 resobj->_allocation_t[0] = ~(allocation + type); 145 resobj->_allocation_t[0] = ~(allocation + type);
146 if (type != STACK_OR_EMBEDDED) { 146 if (type != STACK_OR_EMBEDDED) {
147 // Called from operator new() and CollectionSetChooser(), 147 // Called from operator new() and CollectionSetChooser(),