Mercurial > hg > truffle
diff src/share/vm/ci/ciField.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 957c266d8bc5 da91efe96a93 |
children | 989155e2d07a |
line wrap: on
line diff
--- a/src/share/vm/ci/ciField.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/ci/ciField.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -125,11 +125,11 @@ return; } - instanceKlass* loaded_decl_holder = declared_holder->get_instanceKlass(); + InstanceKlass* loaded_decl_holder = declared_holder->get_instanceKlass(); // Perform the field lookup. fieldDescriptor field_desc; - klassOop canonical_holder = + Klass* canonical_holder = loaded_decl_holder->find_field(name, signature, &field_desc); if (canonical_holder == NULL) { // Field lookup failed. Will be detected by will_link. @@ -186,7 +186,7 @@ // Get the flags, offset, and canonical holder of the field. _flags = ciFlags(fd->access_flags()); _offset = fd->offset(); - _holder = CURRENT_ENV->get_object(fd->field_holder())->as_instance_klass(); + _holder = CURRENT_ENV->get_instance_klass(fd->field_holder()); // Check to see if the field is constant. if (_holder->is_initialized() && this->is_final()) { @@ -213,7 +213,7 @@ // may change. The three examples are java.lang.System.in, // java.lang.System.out, and java.lang.System.err. - KlassHandle k = _holder->get_klassOop(); + KlassHandle k = _holder->get_Klass(); assert( SystemDictionary::System_klass() != NULL, "Check once per vm"); if( k() == SystemDictionary::System_klass() ) { // Check offsets for case 2: System.in, System.out, or System.err