diff -r fbe08d791778 -r 7fe4347e6792 hotspot/src/share/vm/oops/fieldStreams.hpp
--- a/hotspot/src/share/vm/oops/fieldStreams.hpp	Mon Dec 22 11:21:20 2014 +0100
+++ b/hotspot/src/share/vm/oops/fieldStreams.hpp	Tue Dec 16 13:49:36 2014 +0100
@@ -51,7 +51,7 @@
 
   int init_generic_signature_start_slot() {
     int length = _fields->length();
-    int num_fields = 0;
+    int num_fields = _index;
     int skipped_generic_signature_slots = 0;
     FieldInfo* fi;
     AccessFlags flags;