src/hotspot/share/code/dependencies.cpp

roman_version

*** 1816,1831 ****
    assert(method_handle != NULL, "sanity");
    assert(call_site->is_a(SystemDictionary::CallSite_klass()),     "sanity");
  
    if (changes == NULL) {
      // Validate all CallSites
!     if (java_lang_invoke_CallSite::target(call_site) != method_handle)
        return call_site->klass();  // assertion failed
    } else {
      // Validate the given CallSite
!     if (call_site == changes->call_site() && java_lang_invoke_CallSite::target(call_site) != changes->method_handle()) {
!       assert(method_handle != changes->method_handle(), "must be");
        return call_site->klass();  // assertion failed
      }
    }
    return NULL;  // assertion still valid
  }
--- 1816,1831 ----
    assert(method_handle != NULL, "sanity");
    assert(call_site->is_a(SystemDictionary::CallSite_klass()),     "sanity");
  
    if (changes == NULL) {
      // Validate all CallSites
!     if (!oopDesc::equals(java_lang_invoke_CallSite::target(call_site), method_handle))
        return call_site->klass();  // assertion failed
    } else {
      // Validate the given CallSite
!     if (oopDesc::equals(call_site, changes->call_site()) && !oopDesc::equals(java_lang_invoke_CallSite::target(call_site), changes->method_handle())) {
!       assert(!oopDesc::equals(method_handle, changes->method_handle()), "must be");
        return call_site->klass();  // assertion failed
      }
    }
    return NULL;  // assertion still valid
  }