comparison src/share/vm/memory/allocation.hpp @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents d8041d695d19
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
218 // Calling new or delete will result in fatal error. 218 // Calling new or delete will result in fatal error.
219 219
220 class StackObj ALLOCATION_SUPER_CLASS_SPEC { 220 class StackObj ALLOCATION_SUPER_CLASS_SPEC {
221 private: 221 private:
222 void* operator new(size_t size) throw(); 222 void* operator new(size_t size) throw();
223 void* operator new [](size_t size) throw();
224 #ifdef __IBMCPP__
225 public:
226 #endif
223 void operator delete(void* p); 227 void operator delete(void* p);
224 void* operator new [](size_t size) throw();
225 void operator delete [](void* p); 228 void operator delete [](void* p);
226 }; 229 };
227 230
228 // Base class for objects used as value objects. 231 // Base class for objects used as value objects.
229 // Calling new or delete will result in fatal error. 232 // Calling new or delete will result in fatal error.
262 265
263 class ClassLoaderData; 266 class ClassLoaderData;
264 267
265 class MetaspaceObj { 268 class MetaspaceObj {
266 public: 269 public:
267 bool is_metaspace_object() const; // more specific test but slower 270 bool is_metaspace_object() const;
268 bool is_shared() const; 271 bool is_shared() const;
269 void print_address_on(outputStream* st) const; // nonvirtual address printing 272 void print_address_on(outputStream* st) const; // nonvirtual address printing
270 273
271 #define METASPACE_OBJ_TYPES_DO(f) \ 274 #define METASPACE_OBJ_TYPES_DO(f) \
272 f(Unknown) \ 275 f(Unknown) \
574 allocation_type get_allocation_type() const; 577 allocation_type get_allocation_type() const;
575 bool allocated_on_stack() const { return get_allocation_type() == STACK_OR_EMBEDDED; } 578 bool allocated_on_stack() const { return get_allocation_type() == STACK_OR_EMBEDDED; }
576 bool allocated_on_res_area() const { return get_allocation_type() == RESOURCE_AREA; } 579 bool allocated_on_res_area() const { return get_allocation_type() == RESOURCE_AREA; }
577 bool allocated_on_C_heap() const { return get_allocation_type() == C_HEAP; } 580 bool allocated_on_C_heap() const { return get_allocation_type() == C_HEAP; }
578 bool allocated_on_arena() const { return get_allocation_type() == ARENA; } 581 bool allocated_on_arena() const { return get_allocation_type() == ARENA; }
579 ResourceObj(); // default construtor 582 ResourceObj(); // default constructor
580 ResourceObj(const ResourceObj& r); // default copy construtor 583 ResourceObj(const ResourceObj& r); // default copy constructor
581 ResourceObj& operator=(const ResourceObj& r); // default copy assignment 584 ResourceObj& operator=(const ResourceObj& r); // default copy assignment
582 ~ResourceObj(); 585 ~ResourceObj();
583 #endif // ASSERT 586 #endif // ASSERT
584 587
585 public: 588 public: