--- old/src/share/vm/classfile/javaClasses.cpp	2015-11-03 19:47:01.000000000 +0300
+++ new/src/share/vm/classfile/javaClasses.cpp	2015-11-03 19:47:01.000000000 +0300
@@ -3013,14 +3013,11 @@
   }
 }
 
-nmethodBucket* java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(oop call_site) {
+DependencyContext java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(oop call_site) {
   assert(java_lang_invoke_MethodHandleNatives_CallSiteContext::is_instance(call_site), "");
-  return (nmethodBucket*) (address) call_site->long_field(_vmdependencies_offset);
-}
-
-void java_lang_invoke_MethodHandleNatives_CallSiteContext::set_vmdependencies(oop call_site, nmethodBucket* context) {
-  assert(java_lang_invoke_MethodHandleNatives_CallSiteContext::is_instance(call_site), "");
-  call_site->long_field_put(_vmdependencies_offset, (jlong) (address) context);
+  intptr_t* vmdeps_addr = (intptr_t*)call_site->address_field_addr(_vmdependencies_offset);
+  DependencyContext dep_ctx(vmdeps_addr);
+  return dep_ctx;
 }
 
 // Support for java_security_AccessControlContext