comparison src/share/vm/oops/symbol.cpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents a1ebd310d5c1
children d9eed26d638a
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
53 53
54 void* Symbol::operator new(size_t sz, int len, ClassLoaderData* loader_data, TRAPS) { 54 void* Symbol::operator new(size_t sz, int len, ClassLoaderData* loader_data, TRAPS) {
55 address res; 55 address res;
56 int alloc_size = size(len)*HeapWordSize; 56 int alloc_size = size(len)*HeapWordSize;
57 res = (address) Metaspace::allocate(loader_data, size(len), true, 57 res = (address) Metaspace::allocate(loader_data, size(len), true,
58 Metaspace::NonClassType, CHECK_NULL); 58 MetaspaceObj::SymbolType, CHECK_NULL);
59 return res; 59 return res;
60 } 60 }
61 61
62 void Symbol::operator delete(void *p) { 62 void Symbol::operator delete(void *p) {
63 assert(((Symbol*)p)->refcount() == 0, "should not call this"); 63 assert(((Symbol*)p)->refcount() == 0, "should not call this");