1.1 --- a/src/share/vm/ci/ciField.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/ci/ciField.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -125,11 +125,11 @@
1.4 return;
1.5 }
1.6
1.7 - instanceKlass* loaded_decl_holder = declared_holder->get_instanceKlass();
1.8 + InstanceKlass* loaded_decl_holder = declared_holder->get_instanceKlass();
1.9
1.10 // Perform the field lookup.
1.11 fieldDescriptor field_desc;
1.12 - klassOop canonical_holder =
1.13 + Klass* canonical_holder =
1.14 loaded_decl_holder->find_field(name, signature, &field_desc);
1.15 if (canonical_holder == NULL) {
1.16 // Field lookup failed. Will be detected by will_link.
1.17 @@ -186,7 +186,7 @@
1.18 // Get the flags, offset, and canonical holder of the field.
1.19 _flags = ciFlags(fd->access_flags());
1.20 _offset = fd->offset();
1.21 - _holder = CURRENT_ENV->get_object(fd->field_holder())->as_instance_klass();
1.22 + _holder = CURRENT_ENV->get_instance_klass(fd->field_holder());
1.23
1.24 // Check to see if the field is constant.
1.25 if (_holder->is_initialized() && this->is_final()) {
1.26 @@ -213,7 +213,7 @@
1.27 // may change. The three examples are java.lang.System.in,
1.28 // java.lang.System.out, and java.lang.System.err.
1.29
1.30 - KlassHandle k = _holder->get_klassOop();
1.31 + KlassHandle k = _holder->get_Klass();
1.32 assert( SystemDictionary::System_klass() != NULL, "Check once per vm");
1.33 if( k() == SystemDictionary::System_klass() ) {
1.34 // Check offsets for case 2: System.in, System.out, or System.err
