src/share/vm/classfile/classFileParser.hpp

*** 77,87 ****
   private:
    const ClassFileStream* _stream; // Actual input stream
    const Symbol* _requested_name;
    Symbol* _class_name;
    mutable ClassLoaderData* _loader_data;
!   const Klass* _host_klass;
    GrowableArray<Handle>* _cp_patches; // overrides for CP entries
  
    // Metadata created before the instance klass is created.  Must be deallocated
    // if not transferred to the InstanceKlass upon successful class loading
    // in which case these pointers have been set to NULL.
--- 77,87 ----
   private:
    const ClassFileStream* _stream; // Actual input stream
    const Symbol* _requested_name;
    Symbol* _class_name;
    mutable ClassLoaderData* _loader_data;
!   const InstanceKlass* _host_klass;
    GrowableArray<Handle>* _cp_patches; // overrides for CP entries
  
    // Metadata created before the instance klass is created.  Must be deallocated
    // if not transferred to the InstanceKlass upon successful class loading
    // in which case these pointers have been set to NULL.
*** 153,162 ****
--- 153,165 ----
  
    void post_process_parsed_stream(const ClassFileStream* const stream,
                                    ConstantPool* cp,
                                    TRAPS);
  
+   void prepend_host_package_name(const InstanceKlass* host_klass, TRAPS);
+   void fix_anonymous_class_name(TRAPS);
+ 
    void fill_instance_klass(InstanceKlass* ik, bool cf_changed_in_CFLH, TRAPS);
    void set_klass(InstanceKlass* instance);
  
    void set_class_synthetic_flag(bool x)        { _synthetic_flag = x; }
    void set_class_sourcefile_index(u2 x)        { _sourcefile_index = x; }
*** 472,482 ****
   public:
    ClassFileParser(ClassFileStream* stream,
                    Symbol* name,
                    ClassLoaderData* loader_data,
                    Handle protection_domain,
!                   const Klass* host_klass,
                    GrowableArray<Handle>* cp_patches,
                    Publicity pub_level,
                    TRAPS);
  
    ~ClassFileParser();
--- 475,485 ----
   public:
    ClassFileParser(ClassFileStream* stream,
                    Symbol* name,
                    ClassLoaderData* loader_data,
                    Handle protection_domain,
!                   const InstanceKlass* host_klass,
                    GrowableArray<Handle>* cp_patches,
                    Publicity pub_level,
                    TRAPS);
  
    ~ClassFileParser();
*** 498,508 ****
    u2 super_class_index() const { return _super_class_index; }
  
    bool is_anonymous() const { return _host_klass != NULL; }
    bool is_interface() const { return _access_flags.is_interface(); }
  
!   const Klass* host_klass() const { return _host_klass; }
    const GrowableArray<Handle>* cp_patches() const { return _cp_patches; }
    ClassLoaderData* loader_data() const { return _loader_data; }
    const Symbol* class_name() const { return _class_name; }
    const Klass* super_klass() const { return _super_klass; }
  
--- 501,511 ----
    u2 super_class_index() const { return _super_class_index; }
  
    bool is_anonymous() const { return _host_klass != NULL; }
    bool is_interface() const { return _access_flags.is_interface(); }
  
!   const InstanceKlass* host_klass() const { return _host_klass; }
    const GrowableArray<Handle>* cp_patches() const { return _cp_patches; }
    ClassLoaderData* loader_data() const { return _loader_data; }
    const Symbol* class_name() const { return _class_name; }
    const Klass* super_klass() const { return _super_klass; }