Mercurial > hg > graal-jvmci-8
changeset 3589:faa4e0c20d6a
Merge
author | Gilles Duboscq <gilles.m.duboscq@gmail.com> |
---|---|
date | Mon, 17 Oct 2011 14:08:47 +0200 |
parents | fac58f1753a4 (current diff) 1692a2f9bfc5 (diff) |
children | b2015b970785 |
files | |
diffstat | 1 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalVMEntries.cpp Mon Oct 17 14:07:33 2011 +0200 +++ b/src/share/vm/graal/graalVMEntries.cpp Mon Oct 17 14:08:47 2011 +0200 @@ -803,11 +803,24 @@ GrowableArray<ciField*>* fields = instance_klass->non_static_fields(); { VM_ENTRY_MARK; - fieldsArray = oopFactory::new_objArray(SystemDictionary::RiField_klass(), fields->length(), CHECK_NULL); + + int count = 0; for (int i = 0; i < fields->length(); i++) { ciField* field = fields->at(i); - Handle field_handle = GraalCompiler::get_RiField(field, instance_klass, klass_handle, Bytecodes::_illegal, CHECK_NULL); - fieldsArray->obj_at_put(i, field_handle()); + if (field->holder() == instance_klass) { + count++; + } + } + + fieldsArray = oopFactory::new_objArray(SystemDictionary::RiField_klass(), count, CHECK_NULL); + int z = 0; + for (int i = 0; i < fields->length(); i++) { + ciField* field = fields->at(i); + if (field->holder() == instance_klass) { + Handle field_handle = GraalCompiler::get_RiField(field, instance_klass, klass_handle, Bytecodes::_illegal, CHECK_NULL); + fieldsArray->obj_at_put(z, field_handle()); + z++; + } } } return JNIHandles::make_local(fieldsArray());