Mercurial > hg > graal-jvmci-8
diff src/share/vm/memory/allocation.cpp @ 1745:ebfb7c68865e
Merge
author | dcubed |
---|---|
date | Mon, 23 Aug 2010 08:44:03 -0700 |
parents | 413ad0331a0c f8c5d1bdaad4 |
children | f95d63e2154a |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.cpp Fri Aug 20 14:24:47 2010 -0700 +++ b/src/share/vm/memory/allocation.cpp Mon Aug 23 08:44:03 2010 -0700 @@ -58,7 +58,7 @@ void ResourceObj::operator delete(void* p) { assert(((ResourceObj *)p)->allocated_on_C_heap(), "delete only allowed for C_HEAP objects"); - DEBUG_ONLY(((ResourceObj *)p)->_allocation = (uintptr_t) badHeapOopVal;) + DEBUG_ONLY(((ResourceObj *)p)->_allocation = (uintptr_t)badHeapOopVal;) FreeHeap(p); } @@ -104,7 +104,7 @@ ResourceObj::~ResourceObj() { // allocated_on_C_heap() also checks that encoded (in _allocation) address == this. if (!allocated_on_C_heap()) { // ResourceObj::delete() zaps _allocation for C_heap. - _allocation = (uintptr_t) badHeapOopVal; // zap type + _allocation = (uintptr_t)badHeapOopVal; // zap type } } #endif // ASSERT