6914300: ciEnv should export all well known classes

Reviewed-by: kvn, twisti
This commit is contained in:
Tom Rodriguez 2010-01-06 14:22:39 -08:00
parent 6c0af1575c
commit 98449cf2c2
64 changed files with 361 additions and 443 deletions

View file

@ -627,7 +627,7 @@ static inline klassOop oop_to_klassOop(oop obj) {
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");
@ -1896,7 +1896,7 @@ void JvmtiExport::record_vm_internal_object_allocation(oop obj) {
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);
}
}