# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1318853327 -7200
# Node ID faa4e0c20d6ae9235649ad4812566988ea53b9eb
# Parent  fac58f1753a40c9909944551219d225b1485b816# Parent  1692a2f9bfc5df537b6c01b2aa19e71e27a0ef37
Merge

diff -r fac58f1753a4 -r faa4e0c20d6a src/share/vm/graal/graalVMEntries.cpp
--- 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());