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

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 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.

*** 23,32 ****
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "classfile/metadataOnStackMark.hpp"
  #include "classfile/systemDictionary.hpp"
+ #include "code/codeCache.hpp"
  #include "code/debugInfoRec.hpp"
  #include "gc_interface/collectedHeap.inline.hpp"
  #include "interpreter/bytecodeStream.hpp"
  #include "interpreter/bytecodeTracer.hpp"
  #include "interpreter/bytecodes.hpp"

*** 1725,1735 ****
--- 1726,1736 ----
    SystemDictionary::notice_modification();
    {
      // Deoptimize all dependents on this method
      HandleMark hm(thread);
      methodHandle mh(thread, method);
!     Universe::flush_dependents_on_method(mh);
!     CodeCache::flush_dependents_on_method(mh);
    }
  }
  
  void BreakpointInfo::clear(Method* method) {
    *method->bcp_from(_bci) = orig_bytecode();