Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/jvmtiExport.cpp @ 1144:9b9c1ee9b3f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Wed, 06 Jan 2010 22:21:39 -0800
parents dcb15a6f342d 4ce7240d622c
children 3908ad124838
comparison
equal deleted inserted replaced
1129:a5a6adfca6ec 1144:9b9c1ee9b3f6
654 #ifndef JVMTI_KERNEL 654 #ifndef JVMTI_KERNEL
655 static inline klassOop oop_to_klassOop(oop obj) { 655 static inline klassOop oop_to_klassOop(oop obj) {
656 klassOop k = obj->klass(); 656 klassOop k = obj->klass();
657 657
658 // if the object is a java.lang.Class then return the java mirror 658 // if the object is a java.lang.Class then return the java mirror
659 if (k == SystemDictionary::class_klass()) { 659 if (k == SystemDictionary::Class_klass()) {
660 if (!java_lang_Class::is_primitive(obj)) { 660 if (!java_lang_Class::is_primitive(obj)) {
661 k = java_lang_Class::as_klassOop(obj); 661 k = java_lang_Class::as_klassOop(obj);
662 assert(k != NULL, "class for non-primitive mirror must exist"); 662 assert(k != NULL, "class for non-primitive mirror must exist");
663 } 663 }
664 } 664 }
1923 JvmtiVMObjectAllocEventCollector *collector; 1923 JvmtiVMObjectAllocEventCollector *collector;
1924 collector = state->get_vm_object_alloc_event_collector(); 1924 collector = state->get_vm_object_alloc_event_collector();
1925 if (collector != NULL && collector->is_enabled()) { 1925 if (collector != NULL && collector->is_enabled()) {
1926 // Don't record classes as these will be notified via the ClassLoad 1926 // Don't record classes as these will be notified via the ClassLoad
1927 // event. 1927 // event.
1928 if (obj->klass() != SystemDictionary::class_klass()) { 1928 if (obj->klass() != SystemDictionary::Class_klass()) {
1929 collector->record_allocation(obj); 1929 collector->record_allocation(obj);
1930 } 1930 }
1931 } 1931 }
1932 } 1932 }
1933 } 1933 }