Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiExport.cpp @ 1144:9b9c1ee9b3f6
Merge
author | iveresov |
---|---|
date | Wed, 06 Jan 2010 22:21:39 -0800 |
parents | dcb15a6f342d 4ce7240d622c |
children | 3908ad124838 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiExport.cpp Wed Dec 23 03:12:16 2009 -0800 +++ b/src/share/vm/prims/jvmtiExport.cpp Wed Jan 06 22:21:39 2010 -0800 @@ -656,7 +656,7 @@ klassOop k = obj->klass(); // if the object is a java.lang.Class then return the java mirror - if (k == SystemDictionary::class_klass()) { + if (k == SystemDictionary::Class_klass()) { if (!java_lang_Class::is_primitive(obj)) { k = java_lang_Class::as_klassOop(obj); assert(k != NULL, "class for non-primitive mirror must exist"); @@ -1925,7 +1925,7 @@ if (collector != NULL && collector->is_enabled()) { // Don't record classes as these will be notified via the ClassLoad // event. - if (obj->klass() != SystemDictionary::class_klass()) { + if (obj->klass() != SystemDictionary::Class_klass()) { collector->record_allocation(obj); } }