src/hotspot/share/classfile/javaClasses.cpp

*** 3739,3748 ****
--- 3739,3749 ----
  }
  
  // Support for java_lang_invoke_MethodHandleNatives_CallSiteContext
  
  int java_lang_invoke_MethodHandleNatives_CallSiteContext::_vmdependencies_offset;
+ int java_lang_invoke_MethodHandleNatives_CallSiteContext::_last_cleanup_offset;
  
  void java_lang_invoke_MethodHandleNatives_CallSiteContext::compute_offsets() {
    InstanceKlass* k = SystemDictionary::Context_klass();
    CALLSITECONTEXT_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
  }
***************
*** 3753,3764 ****
  }
  #endif
  
  DependencyContext java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(oop call_site) {
    assert(java_lang_invoke_MethodHandleNatives_CallSiteContext::is_instance(call_site), "");
!   intptr_t* vmdeps_addr = (intptr_t*)call_site->field_addr(_vmdependencies_offset);
!   DependencyContext dep_ctx(vmdeps_addr);
    return dep_ctx;
  }
  
  // Support for java_security_AccessControlContext
  
--- 3754,3766 ----
  }
  #endif
  
  DependencyContext java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(oop call_site) {
    assert(java_lang_invoke_MethodHandleNatives_CallSiteContext::is_instance(call_site), "");
!   nmethodBucket* volatile* vmdeps_addr = (nmethodBucket* volatile*)call_site->field_addr(_vmdependencies_offset);
!   volatile uint64_t* last_cleanup_addr = (volatile uint64_t*)call_site->field_addr(_last_cleanup_offset);
!   DependencyContext dep_ctx(vmdeps_addr, last_cleanup_addr);
    return dep_ctx;
  }
  
  // Support for java_security_AccessControlContext