--- a/hotspot/src/share/vm/ci/ciStreams.cpp	Fri May 29 12:49:31 2015 +0200
+++ b/hotspot/src/share/vm/ci/ciStreams.cpp	Fri May 29 17:04:21 2015 +0300
@@ -477,8 +477,10 @@
 // ------------------------------------------------------------------
 // ciBytecodeStream::get_resolved_references
 ciObjArray* ciBytecodeStream::get_resolved_references() {
-  VM_ENTRY_MARK;
-  objArrayOop resolved_references = _holder->get_instanceKlass()->resolved_references();
+    VM_ENTRY_MARK;
+    // Get the constant pool.
+  ConstantPool*        cpool   = _holder->get_instanceKlass()->constants();
+
   // Create a resolved references array and return it.
-  return CURRENT_ENV->get_object(resolved_references)->as_obj_array();
-}
+  return CURRENT_ENV->get_object(cpool->resolved_references())->as_obj_array();
+  }