Merge

Mon, 27 Apr 2015 14:58:54 -0700

author
asaha
date
Mon, 27 Apr 2015 14:58:54 -0700
changeset 8093
cd1af0e3bfb3
parent 8092
73d886e633a6
parent 7937
b2f5f1a83b73
child 8094
1d432458e33e

Merge

.hgtags file | annotate | diff | comparison | revisions
make/hotspot_version file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Apr 20 13:35:17 2015 -0700
     1.2 +++ b/.hgtags	Mon Apr 27 14:58:54 2015 -0700
     1.3 @@ -624,6 +624,7 @@
     1.4  5c017acbaf015fb8ecca6f00870965f3deb4e1ac jdk8u51-b07
     1.5  631d4029d851b59613e6748e17447001a682276e jdk8u51-b08
     1.6  ce81c4487dd1e9f89d4570a8cd25e349f6bae00d jdk8u51-b09
     1.7 +928e1994ad43272f808ca22b9cc1b08a7ce2824f jdk8u51-b10
     1.8  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
     1.9  9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
    1.10  0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
     2.1 --- a/src/share/vm/prims/jvmtiClassFileReconstituter.hpp	Mon Apr 20 13:35:17 2015 -0700
     2.2 +++ b/src/share/vm/prims/jvmtiClassFileReconstituter.hpp	Mon Apr 27 14:58:54 2015 -0700
     2.3 @@ -68,11 +68,11 @@
     2.4  
     2.5    ~JvmtiConstantPoolReconstituter() {
     2.6      if (_symmap != NULL) {
     2.7 -      os::free(_symmap, mtClass);
     2.8 +      delete _symmap;
     2.9        _symmap = NULL;
    2.10      }
    2.11      if (_classmap != NULL) {
    2.12 -      os::free(_classmap, mtClass);
    2.13 +      delete _classmap;
    2.14        _classmap = NULL;
    2.15      }
    2.16    }

mercurial