diff -r 937fdd7561c2 -r c188d81b4f8e hotspot/src/share/vm/oops/instanceKlass.hpp
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp	Sat May 05 10:24:55 2012 -0400
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	Wed May 09 10:54:29 2012 -0700
@@ -352,7 +352,7 @@
   int java_fields_count() const           { return (int)_java_fields_count; }
 
   // Number of fields including any injected fields
-  int all_fields_count() const            { return _fields->length() / sizeof(FieldInfo::field_slots); }
+  int all_fields_count() const            { return _fields->length() / FieldInfo::field_slots; }
 
   typeArrayOop fields() const              { return _fields; }