--- a/hotspot/src/share/vm/interpreter/rewriter.cpp	Wed May 03 02:32:02 2017 +0000
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp	Fri Mar 03 23:08:35 2017 -0800
@@ -94,11 +94,14 @@
                                   _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);
-  _pool->set_cache(cache);
-  cache->set_constant_pool(_pool());
 }