*** old/src/share/vm/code/nmethod.hpp	Thu Sep  4 20:56:04 2014
--- new/src/share/vm/code/nmethod.hpp	Thu Sep  4 20:56:04 2014

*** 446,456 ****
--- 446,459 ----
  
    // Make the nmethod non entrant. The nmethod will continue to be
    // alive.  It is used when an uncommon trap happens.  Returns true
    // if this thread changed the state of the nmethod or false if
    // another thread performed the transition.
-   bool  make_not_entrant() { return make_not_entrant_or_zombie(not_entrant); }
+     assert(!method()->is_method_handle_intrinsic(), "Cannot make MH intrinsic not entrant");
+     return make_not_entrant_or_zombie(not_entrant);
+   }
    bool  make_zombie()      { return make_not_entrant_or_zombie(zombie); }
  
    // used by jvmti to track if the unload event has been reported
    bool  unload_reported()                         { return _unload_reported; }
    void  set_unload_reported()                     { _unload_reported = true; }