Mercurial > hg > truffle

diff src/share/vm/memory/allocation.cpp @ 17795:a9becfeecd1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 22 Jan 2014 17:42:23 -0800
parents 2b8e28fdf503 849eb7bfceac
children 752ba2e5f6d0
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.cpp	Thu Jan 16 14:25:51 2014 +0100
+++ b/src/share/vm/memory/allocation.cpp	Wed Jan 22 17:42:23 2014 -0800
@@ -143,7 +143,7 @@
 void ResourceObj::set_allocation_type(address res, allocation_type type) {
     // Set allocation type in the resource object
     uintptr_t allocation = (uintptr_t)res;
-    assert((allocation & allocation_mask) == 0, "address should be aligned to 4 bytes at least");
+    assert((allocation & allocation_mask) == 0, err_msg("address should be aligned to 4 bytes at least: " PTR_FORMAT, res));
     assert(type <= allocation_mask, "incorrect allocation type");
     ResourceObj* resobj = (ResourceObj *)res;
     resobj->_allocation_t[0] = ~(allocation + type);