Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jvmtiEnv.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 4ceaf61479fc |
children | 0ebca2e35ca5 d2a62e0f25eb |
comparison
equal
deleted
inserted
replaced
4703:2cfb7fb2dce7 | 4970:33df1aeaebbf |
---|---|
265 return JVMTI_ERROR_UNMODIFIABLE_CLASS; | 265 return JVMTI_ERROR_UNMODIFIABLE_CLASS; |
266 } | 266 } |
267 | 267 |
268 instanceKlassHandle ikh(current_thread, k_oop); | 268 instanceKlassHandle ikh(current_thread, k_oop); |
269 if (ikh->get_cached_class_file_bytes() == NULL) { | 269 if (ikh->get_cached_class_file_bytes() == NULL) { |
270 // not cached, we need to reconstitute the class file from VM representation | 270 // Not cached, we need to reconstitute the class file from the |
271 // VM representation. We don't attach the reconstituted class | |
272 // bytes to the instanceKlass here because they have not been | |
273 // validated and we're not at a safepoint. | |
271 constantPoolHandle constants(current_thread, ikh->constants()); | 274 constantPoolHandle constants(current_thread, ikh->constants()); |
272 ObjectLocker ol(constants, current_thread); // lock constant pool while we query it | 275 ObjectLocker ol(constants, current_thread); // lock constant pool while we query it |
273 | 276 |
274 JvmtiClassFileReconstituter reconstituter(ikh); | 277 JvmtiClassFileReconstituter reconstituter(ikh); |
275 if (reconstituter.get_error() != JVMTI_ERROR_NONE) { | 278 if (reconstituter.get_error() != JVMTI_ERROR_NONE) { |