src/share/vm/oops/cpCache.cpp

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/rewriter.hpp"
  #include "logging/log.hpp"
+ #include "memory/metaspaceClosure.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/cpCache.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
*** 560,570 ****
                                       const intStack& invokedynamic_map, TRAPS) {
  
    const int length = index_map.length() + invokedynamic_index_map.length();
    int size = ConstantPoolCache::size(length);
  
!   return new (loader_data, size, false, MetaspaceObj::ConstantPoolCacheType, THREAD)
      ConstantPoolCache(length, index_map, invokedynamic_index_map, invokedynamic_map);
  }
  
  void ConstantPoolCache::initialize(const intArray& inverse_index_map,
                                     const intArray& invokedynamic_inverse_index_map,
--- 561,571 ----
                                       const intStack& invokedynamic_map, TRAPS) {
  
    const int length = index_map.length() + invokedynamic_index_map.length();
    int size = ConstantPoolCache::size(length);
  
!   return new (loader_data, size, MetaspaceObj::ConstantPoolCacheType, THREAD)
      ConstantPoolCache(length, index_map, invokedynamic_index_map, invokedynamic_map);
  }
  
  void ConstantPoolCache::initialize(const intArray& inverse_index_map,
                                     const intArray& invokedynamic_inverse_index_map,
*** 646,655 ****
--- 647,661 ----
      }
    }
  }
  #endif // INCLUDE_JVMTI
  
+ void ConstantPoolCache::metaspace_pointers_do(MetaspaceClosure* it) {
+   log_trace(cds)("Iter(ConstantPoolCache): %p", this);
+   it->push(&_constant_pool);
+   it->push(&_reference_map);
+ }
  
  // Printing
  
  void ConstantPoolCache::print_on(outputStream* st) const {
    assert(is_constantPoolCache(), "obj must be constant pool cache");