src/share/vm/interpreter/rewriter.cpp

*** 92,106 ****
        ConstantPoolCache::allocate(loader_data, _cp_cache_map,
                                    _invokedynamic_cp_cache_map,
                                    _invokedynamic_references_map, CHECK);
  
    // initialize object cache in constant pool
    _pool->initialize_resolved_references(loader_data, _resolved_references_map,
                                          _resolved_reference_limit,
                                          CHECK);
-   _pool->set_cache(cache);
-   cache->set_constant_pool(_pool());
  }
  
  
  
  // The new finalization semantics says that registration of
--- 92,109 ----
        ConstantPoolCache::allocate(loader_data, _cp_cache_map,
                                    _invokedynamic_cp_cache_map,
                                    _invokedynamic_references_map, CHECK);
  
    // initialize object cache in constant pool
+   _pool->set_cache(cache);
+   cache->set_constant_pool(_pool());
+ 
+   // _resolved_references is stored in pool->cache(), so need to be done after
+   // the above lines.
    _pool->initialize_resolved_references(loader_data, _resolved_references_map,
                                          _resolved_reference_limit,
                                          CHECK);
  }
  
  
  
  // The new finalization semantics says that registration of