*** old/src/share/vm/prims/methodHandles.cpp	Tue Jan  6 19:35:39 2015
--- new/src/share/vm/prims/methodHandles.cpp	Tue Jan  6 19:35:38 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "classfile/stringTable.hpp"
+ #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/oopMapCache.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/oopFactory.hpp"

*** 1243,1253 ****
--- 1244,1254 ----
    Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
    Handle target   (THREAD, JNIHandles::resolve(target_jh));
    {
      // Walk all nmethods depending on this call site.
      MutexLocker mu(Compile_lock, thread);
!     Universe::flush_dependents_on(call_site, target);
!     CodeCache::flush_dependents_on(call_site, target);
      java_lang_invoke_CallSite::set_target(call_site(), target());
    }
  }
  JVM_END
  

*** 1255,1265 ****
--- 1256,1266 ----
    Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh));
    Handle target   (THREAD, JNIHandles::resolve(target_jh));
    {
      // Walk all nmethods depending on this call site.
      MutexLocker mu(Compile_lock, thread);
!     Universe::flush_dependents_on(call_site, target);
!     CodeCache::flush_dependents_on(call_site, target);
      java_lang_invoke_CallSite::set_target_volatile(call_site(), target());
    }
  }
  JVM_END