comparison src/share/vm/oops/symbol.cpp @ 12355:cefad50507d8

Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents 9758d9f36299
children cd6b3f1a94ff
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
39 for (int i = 0; i < _length; i++) { 39 for (int i = 0; i < _length; i++) {
40 byte_at_put(i, name[i]); 40 byte_at_put(i, name[i]);
41 } 41 }
42 } 42 }
43 43
44 void* Symbol::operator new(size_t sz, int len, TRAPS) { 44 void* Symbol::operator new(size_t sz, int len, TRAPS) throw() {
45 int alloc_size = size(len)*HeapWordSize; 45 int alloc_size = size(len)*HeapWordSize;
46 address res = (address) AllocateHeap(alloc_size, mtSymbol); 46 address res = (address) AllocateHeap(alloc_size, mtSymbol);
47 return res; 47 return res;
48 } 48 }
49 49
50 void* Symbol::operator new(size_t sz, int len, Arena* arena, TRAPS) { 50 void* Symbol::operator new(size_t sz, int len, Arena* arena, TRAPS) throw() {
51 int alloc_size = size(len)*HeapWordSize; 51 int alloc_size = size(len)*HeapWordSize;
52 address res = (address)arena->Amalloc(alloc_size); 52 address res = (address)arena->Amalloc(alloc_size);
53 return res; 53 return res;
54 } 54 }
55 55
56 void* Symbol::operator new(size_t sz, int len, ClassLoaderData* loader_data, TRAPS) { 56 void* Symbol::operator new(size_t sz, int len, ClassLoaderData* loader_data, TRAPS) throw() {
57 address res; 57 address res;
58 int alloc_size = size(len)*HeapWordSize; 58 int alloc_size = size(len)*HeapWordSize;
59 res = (address) Metaspace::allocate(loader_data, size(len), true, 59 res = (address) Metaspace::allocate(loader_data, size(len), true,
60 MetaspaceObj::SymbolType, CHECK_NULL); 60 MetaspaceObj::SymbolType, CHECK_NULL);
61 return res; 61 return res;