archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena()

Browse source 
Pass the check in ResourceObj() if _allocation value is already set and object is allocated on stack.

Reviewed-by: dholmes, johnc
This commit is contained in:
Vladimir Kozlov 2010-08-09 15:17:05 -07:00
parent 7895bef72f
commit 2e48a18645
6 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hotspot/src/share/vm/memory/allocation.hpp
View file

@ -317,6 +317,7 @@ extern void resource_free_bytes( char *old, size_t size );
class ResourceObj ALLOCATION_SUPER_CLASS_SPEC {
public:
enum allocation_type { STACK_OR_EMBEDDED = 0, RESOURCE_AREA, C_HEAP, ARENA, allocation_mask = 0x3 };
static void set_allocation_type(address res, allocation_type type) NOT_DEBUG_RETURN;
#ifdef ASSERT
private:
// When this object is allocated on stack the new() operator is not
@ -324,12 +325,11 @@ class ResourceObj ALLOCATION_SUPER_CLASS_SPEC {
// Store negated 'this' pointer when new() is called to distinguish cases.
uintptr_t _allocation;
public:
static void set_allocation_type(address res, allocation_type type);
allocation_type get_allocation_type();
bool allocated_on_stack() { return get_allocation_type() == STACK_OR_EMBEDDED; }
bool allocated_on_res_area() { return get_allocation_type() == RESOURCE_AREA; }
bool allocated_on_C_heap() { return get_allocation_type() == C_HEAP; }
bool allocated_on_arena() { return get_allocation_type() == ARENA; }
allocation_type get_allocation_type() const;
bool allocated_on_stack() const { return get_allocation_type() == STACK_OR_EMBEDDED; }
bool allocated_on_res_area() const { return get_allocation_type() == RESOURCE_AREA; }
bool allocated_on_C_heap() const { return get_allocation_type() == C_HEAP; }
bool allocated_on_arena() const { return get_allocation_type() == ARENA; }
ResourceObj(); // default construtor
ResourceObj(const ResourceObj& r); // default copy construtor
ResourceObj& operator=(const ResourceObj& r); // default copy assignment
@ -348,11 +348,6 @@ class ResourceObj ALLOCATION_SUPER_CLASS_SPEC {
DEBUG_ONLY(set_allocation_type(res, RESOURCE_AREA);)
return res;
}
void* operator new(size_t size, void* where, allocation_type type) {
address res = (address)where;
DEBUG_ONLY(set_allocation_type(res, type);)
return res;
}
void operator delete(void* p);
};