Mercurial > hg > truffle

comparison src/share/vm/memory/allocation.cpp @ 11019:eaf3742822ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author chegar
date Mon, 17 Jun 2013 11:17:49 +0100
parents ce9ecec70f99 a1ebd310d5c1
children 2b9380b0bf0b
comparison
equal deleted inserted replaced
11018:0861193d358a 11019:eaf3742822ec
58 void _ValueObj::operator delete(void* p) { ShouldNotCallThis(); } 58 void _ValueObj::operator delete(void* p) { ShouldNotCallThis(); }
59 void* _ValueObj::operator new [](size_t size) { ShouldNotCallThis(); return 0; } 59 void* _ValueObj::operator new [](size_t size) { ShouldNotCallThis(); return 0; }
60 void _ValueObj::operator delete [](void* p) { ShouldNotCallThis(); } 60 void _ValueObj::operator delete [](void* p) { ShouldNotCallThis(); }
61 61
62 void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data, 62 void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data,
63 size_t word_size, bool read_only, TRAPS) { 63 size_t word_size, bool read_only,
64 MetaspaceObj::Type type, TRAPS) {
64 // Klass has it's own operator new 65 // Klass has it's own operator new
65 return Metaspace::allocate(loader_data, word_size, read_only, 66 return Metaspace::allocate(loader_data, word_size, read_only,
66 Metaspace::NonClassType, CHECK_NULL); 67 type, CHECK_NULL);
67 } 68 }
68 69
69 bool MetaspaceObj::is_shared() const { 70 bool MetaspaceObj::is_shared() const {
70 return MetaspaceShared::is_in_shared_space(this); 71 return MetaspaceShared::is_in_shared_space(this);
71 } 72 }