--- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Wed Sep 14 16:28:39 2011 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp	Wed Sep 14 13:57:32 2011 -0700
@@ -58,7 +58,7 @@
   // Compute the real number of Java fields
   int java_fields = ikh()->java_fields_count();
 
-  write_u2(java_fields * FieldInfo::field_slots);
+  write_u2(java_fields);
   for (JavaFieldStream fs(ikh()); !fs.done(); fs.next()) {
     AccessFlags access_flags = fs.access_flags();
     int name_index = fs.name_index();