Mercurial > hg > graal-jvmci-8
changeset 23200:cd1af0e3bfb3
Merge
author | asaha |
---|---|
date | Mon, 27 Apr 2015 14:58:54 -0700 |
parents | 73d886e633a6 (current diff) b2f5f1a83b73 (diff) |
children | 1d432458e33e |
files | .hgtags make/hotspot_version |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 20 13:35:17 2015 -0700 +++ b/.hgtags Mon Apr 27 14:58:54 2015 -0700 @@ -624,6 +624,7 @@ 5c017acbaf015fb8ecca6f00870965f3deb4e1ac jdk8u51-b07 631d4029d851b59613e6748e17447001a682276e jdk8u51-b08 ce81c4487dd1e9f89d4570a8cd25e349f6bae00d jdk8u51-b09 +928e1994ad43272f808ca22b9cc1b08a7ce2824f jdk8u51-b10 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06 9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
--- a/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Mon Apr 20 13:35:17 2015 -0700 +++ b/src/share/vm/prims/jvmtiClassFileReconstituter.hpp Mon Apr 27 14:58:54 2015 -0700 @@ -68,11 +68,11 @@ ~JvmtiConstantPoolReconstituter() { if (_symmap != NULL) { - os::free(_symmap, mtClass); + delete _symmap; _symmap = NULL; } if (_classmap != NULL) { - os::free(_classmap, mtClass); + delete _classmap; _classmap = NULL; } }