1.1 --- a/src/share/vm/prims/jvmtiExport.cpp Wed Jun 27 15:23:36 2012 +0200
1.2 +++ b/src/share/vm/prims/jvmtiExport.cpp Thu Jun 28 17:03:16 2012 -0400
1.3 @@ -617,7 +617,7 @@
1.4 if (caching_needed && *_cached_data_ptr == NULL) {
1.5 // data has been changed by the new retransformable agent
1.6 // and it hasn't already been cached, cache it
1.7 - *_cached_data_ptr = (unsigned char *)os::malloc(_curr_len);
1.8 + *_cached_data_ptr = (unsigned char *)os::malloc(_curr_len, mtInternal);
1.9 memcpy(*_cached_data_ptr, _curr_data, _curr_len);
1.10 *_cached_length_ptr = _curr_len;
1.11 }
1.12 @@ -720,7 +720,7 @@
1.13 JvmtiCodeBlobEvents::build_jvmti_addr_location_map(nm, &_map, &_map_length);
1.14 }
1.15 ~JvmtiCompiledMethodLoadEventMark() {
1.16 - FREE_C_HEAP_ARRAY(jvmtiAddrLocationMap, _map);
1.17 + FREE_C_HEAP_ARRAY(jvmtiAddrLocationMap, _map, mtInternal);
1.18 }
1.19
1.20 jint code_size() { return _code_size; }
1.21 @@ -2323,7 +2323,7 @@
1.22 // register a stub
1.23 void JvmtiDynamicCodeEventCollector::register_stub(const char* name, address start, address end) {
1.24 if (_code_blobs == NULL) {
1.25 - _code_blobs = new (ResourceObj::C_HEAP) GrowableArray<JvmtiCodeBlobDesc*>(1,true);
1.26 + _code_blobs = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<JvmtiCodeBlobDesc*>(1,true);
1.27 }
1.28 _code_blobs->append(new JvmtiCodeBlobDesc(name, start, end));
1.29 }
1.30 @@ -2357,7 +2357,7 @@
1.31 void JvmtiVMObjectAllocEventCollector::record_allocation(oop obj) {
1.32 assert(is_enabled(), "VM object alloc event collector is not enabled");
1.33 if (_allocated == NULL) {
1.34 - _allocated = new (ResourceObj::C_HEAP) GrowableArray<oop>(1, true);
1.35 + _allocated = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<oop>(1, true);
1.36 }
1.37 _allocated->push(obj);
1.38 }
