*** old/src/share/vm/classfile/classFileParser.hpp	Fri Sep  9 11:55:05 2011
--- new/src/share/vm/classfile/classFileParser.hpp	Fri Sep  9 11:55:04 2011

*** 31,40 ****
--- 31,43 ----
  #include "oops/typeArrayOop.hpp"
  #include "runtime/handles.inline.hpp"
  #include "utilities/accessFlags.hpp"
  
  class TempNewSymbol;
+ class FieldAllocationCount;
+ 
+ 
  // Parser for for .class files
  //
  // The bytes describing the class file structure is read from a Stream object
  
  class ClassFileParser VALUE_OBJ_CLASS_SPEC {

*** 82,94 ****
--- 85,99 ----
                                bool is_static, u2 signature_index,
                                u2* constantvalue_index_addr,
                                bool* is_synthetic_addr,
                                u2* generic_signature_index_addr,
                                typeArrayHandle* field_annotations, TRAPS);
!   typeArrayHandle parse_fields(constantPoolHandle cp, bool is_interface,
!                                struct FieldAllocationCount *fac,
                                 objArrayHandle* fields_annotations, TRAPS);
!   typeArrayHandle parse_fields(Symbol* class_name,
!                                constantPoolHandle cp, bool is_interface,
+                                FieldAllocationCount *fac,
+                                objArrayHandle* fields_annotations,
+                                int* java_fields_count_ptr, TRAPS);
  
    // Method parsing
    methodHandle parse_method(constantPoolHandle cp, bool is_interface,
                              AccessFlags* promoted_flags,
                              typeArrayHandle* method_annotations,

*** 148,176 ****
--- 153,162 ----
                       unsigned int* nonstatic_oop_counts);
    void set_precomputed_flags(instanceKlassHandle k);
    objArrayHandle compute_transitive_interfaces(instanceKlassHandle super,
                                                 objArrayHandle local_ifs, TRAPS);
  
    // Special handling for certain classes.
    // Add the "discovered" field to java.lang.ref.Reference if
    // it does not exist.
    void java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr,
                                         constantPoolHandle cp,
                                         FieldAllocationCount *fac_ptr, TRAPS);
    // Adjust the field allocation counts for java.lang.Class to add
    // fake fields.
    void java_lang_Class_fix_pre(int* nonstatic_field_size,
                                 FieldAllocationCount *fac_ptr);
    // Adjust the next_nonstatic_oop_offset to place the fake fields
    // before any Java fields.
    void java_lang_Class_fix_post(int* next_nonstatic_oop_offset);
    // Adjust the field allocation counts for java.lang.invoke.MethodHandle to add
    // a fake address (void*) field.
    void java_lang_invoke_MethodHandle_fix_pre(constantPoolHandle cp,
                                       typeArrayHandle fields,
                                       FieldAllocationCount *fac_ptr, TRAPS);
  
    // Format checker methods
    void classfile_parse_error(const char* msg, TRAPS);
    void classfile_parse_error(const char* msg, int index, TRAPS);
    void classfile_parse_error(const char* msg, const char *name, TRAPS);
    void classfile_parse_error(const char* msg, int index, const char *name, TRAPS);