1.1 --- a/src/share/vm/runtime/reflection.cpp Tue Jan 05 11:16:09 2010 -0800
1.2 +++ b/src/share/vm/runtime/reflection.cpp Wed Jan 06 14:22:39 2010 -0800
1.3 @@ -449,7 +449,7 @@
1.4 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
1.5 if ( JDK_Version::is_gte_jdk14x_version()
1.6 && UseNewReflection
1.7 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) {
1.8 + && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.9 return true;
1.10 }
1.11
1.12 @@ -541,7 +541,7 @@
1.13 // sun/reflect/MagicAccessorImpl subclasses to succeed trivially.
1.14 if ( JDK_Version::is_gte_jdk14x_version()
1.15 && UseNewReflection
1.16 - && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_magic_klass())) {
1.17 + && Klass::cast(current_class)->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) {
1.18 return true;
1.19 }
1.20
1.21 @@ -631,7 +631,7 @@
1.22
1.23 objArrayHandle Reflection::get_parameter_types(methodHandle method, int parameter_count, oop* return_type, TRAPS) {
1.24 // Allocate array holding parameter types (java.lang.Class instances)
1.25 - objArrayOop m = oopFactory::new_objArray(SystemDictionary::class_klass(), parameter_count, CHECK_(objArrayHandle()));
1.26 + objArrayOop m = oopFactory::new_objArray(SystemDictionary::Class_klass(), parameter_count, CHECK_(objArrayHandle()));
1.27 objArrayHandle mirrors (THREAD, m);
1.28 int index = 0;
1.29 // Collect parameter types
1.30 @@ -1308,7 +1308,7 @@
1.31 if (Klass::cast(klass)->oop_is_array() && which == MEMBER_DECLARED) return NULL;
1.32
1.33 if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
1.34 - klass = SystemDictionary::object_klass();
1.35 + klass = SystemDictionary::Object_klass();
1.36 }
1.37 instanceKlassHandle h_k(THREAD, klass);
1.38
1.39 @@ -1375,13 +1375,13 @@
1.40 // Exclude primitive types
1.41 if (java_lang_Class::is_primitive(mirror) ||
1.42 (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array() && (which == MEMBER_DECLARED))) {
1.43 - klassOop klass = SystemDictionary::reflect_method_klass();
1.44 + klassOop klass = SystemDictionary::reflect_Method_klass();
1.45 return oopFactory::new_objArray(klass, 0, CHECK_NULL); // Return empty array
1.46 }
1.47
1.48 klassOop klass = java_lang_Class::as_klassOop(mirror);
1.49 if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
1.50 - klass = SystemDictionary::object_klass();
1.51 + klass = SystemDictionary::Object_klass();
1.52 }
1.53 instanceKlassHandle h_k(THREAD, klass);
1.54
1.55 @@ -1411,7 +1411,7 @@
1.56 }
1.57
1.58 // Allocate result
1.59 - klassOop klass = SystemDictionary::reflect_method_klass();
1.60 + klassOop klass = SystemDictionary::reflect_Method_klass();
1.61 objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
1.62 objArrayHandle h_result (THREAD, r);
1.63
1.64 @@ -1462,7 +1462,7 @@
1.65 }
1.66 }
1.67 // Allocate result
1.68 - klassOop klass = SystemDictionary::reflect_method_klass();
1.69 + klassOop klass = SystemDictionary::reflect_Method_klass();
1.70 objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
1.71 objArrayHandle h_result (THREAD, r);
1.72
1.73 @@ -1523,7 +1523,7 @@
1.74 bool prim = java_lang_Class::is_primitive(mirror);
1.75 Klass* k = prim ? NULL : Klass::cast(java_lang_Class::as_klassOop(mirror));
1.76 if (prim || k->is_interface() || k->oop_is_array()) {
1.77 - return oopFactory::new_objArray(SystemDictionary::reflect_constructor_klass(), 0, CHECK_NULL); // Return empty array
1.78 + return oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0, CHECK_NULL); // Return empty array
1.79 }
1.80
1.81 // Must be instanceKlass at this point
