1.1 --- a/src/share/vm/classfile/classFileParser.cpp Tue Jan 05 11:16:09 2010 -0800
1.2 +++ b/src/share/vm/classfile/classFileParser.cpp Wed Jan 06 14:22:39 2010 -0800
1.3 @@ -430,7 +430,7 @@
1.4 case JVM_CONSTANT_UnresolvedClass :
1.5 // Patching a class means pre-resolving it.
1.6 // The name in the constant pool is ignored.
1.7 - if (patch->klass() == SystemDictionary::class_klass()) { // %%% java_lang_Class::is_instance
1.8 + if (patch->klass() == SystemDictionary::Class_klass()) { // %%% java_lang_Class::is_instance
1.9 guarantee_property(!java_lang_Class::is_primitive(patch()),
1.10 "Illegal class patch at %d in class file %s",
1.11 index, CHECK);
1.12 @@ -3469,8 +3469,8 @@
1.13 #endif
1.14
1.15 // Check if this klass supports the java.lang.Cloneable interface
1.16 - if (SystemDictionary::cloneable_klass_loaded()) {
1.17 - if (k->is_subtype_of(SystemDictionary::cloneable_klass())) {
1.18 + if (SystemDictionary::Cloneable_klass_loaded()) {
1.19 + if (k->is_subtype_of(SystemDictionary::Cloneable_klass())) {
1.20 k->set_is_cloneable();
1.21 }
1.22 }
1.23 @@ -4175,7 +4175,7 @@
1.24 // Check if ch is Java identifier start or is Java identifier part
1.25 // 4672820: call java.lang.Character methods directly without generating separate tables.
1.26 EXCEPTION_MARK;
1.27 - instanceKlassHandle klass (THREAD, SystemDictionary::char_klass());
1.28 + instanceKlassHandle klass (THREAD, SystemDictionary::Character_klass());
1.29
1.30 // return value
1.31 JavaValue result(T_BOOLEAN);
