Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/cpCache.hpp	Thu Mar 07 14:06:44 2013 -0500
     1.2 +++ b/src/share/vm/oops/cpCache.hpp	Fri Mar 08 11:47:57 2013 -0500
     1.3 @@ -377,14 +377,21 @@
     1.4    debug_only(friend class ClassVerifier;)
     1.5  
     1.6    // Constructor
     1.7 -  ConstantPoolCache(int length) : _length(length), _constant_pool(NULL) {
     1.8 +  ConstantPoolCache(int length, const intStack& inverse_index_map,
     1.9 +                    const intStack& invokedynamic_references_map) :
    1.10 +                                        _length(length), _constant_pool(NULL) {
    1.11 +    initialize(inverse_index_map, invokedynamic_references_map);
    1.12      for (int i = 0; i < length; i++) {
    1.13        assert(entry_at(i)->is_f1_null(), "Failed to clear?");
    1.14      }
    1.15    }
    1.16  
    1.17 +  // Initialization
    1.18 +  void initialize(const intArray& inverse_index_map, const intArray& invokedynamic_references_map);
    1.19   public:
    1.20 -  static ConstantPoolCache* allocate(ClassLoaderData* loader_data, int length, TRAPS);
    1.21 +  static ConstantPoolCache* allocate(ClassLoaderData* loader_data, int length,
    1.22 +                                     const intStack& inverse_index_map,
    1.23 +                                     const intStack& invokedynamic_references_map, TRAPS);
    1.24    bool is_constantPoolCache() const { return true; }
    1.25  
    1.26    int length() const                             { return _length; }
    1.27 @@ -405,9 +412,6 @@
    1.28    friend class ConstantPoolCacheEntry;
    1.29  
    1.30   public:
    1.31 -  // Initialization
    1.32 -  void initialize(intArray& inverse_index_map, intArray& invokedynamic_references_map);
    1.33 -
    1.34    // Accessors
    1.35    void set_constant_pool(ConstantPool* pool)   { _constant_pool = pool; }
    1.36    ConstantPool* constant_pool() const          { return _constant_pool; }