src/share/vm/opto/runtime.cpp

rev 1178 : merge with cd37471eaecc from http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot

*** 808,818 ****
      fatal("Native mathod should not have path to exception handling");
    } else {
      // we are switching to old paradigm: search for exception handler in caller_frame
      // instead in exception handler of caller_frame.sender()
  
!     if (JvmtiExport::can_post_exceptions()) {
        // "Full-speed catching" is not necessary here,
        // since we're notifying the VM on every catch.
        // Force deoptimization and the rest of the lookup
        // will be fine.
        deoptimize_caller_frame(thread, true);
--- 808,819 ----
      fatal("Native mathod should not have path to exception handling");
    } else {
      // we are switching to old paradigm: search for exception handler in caller_frame
      // instead in exception handler of caller_frame.sender()
  
!     // We only need to deoptimize if exceptions can really cause some event notification
!     if (thread->should_post_on_exceptions_flag()) {
        // "Full-speed catching" is not necessary here,
        // since we're notifying the VM on every catch.
        // Force deoptimization and the rest of the lookup
        // will be fine.
        deoptimize_caller_frame(thread, true);
*** 1209,1213 ****
--- 1210,1215 ----
  JRT_LEAF(void, OptoRuntime::zap_dead_native_locals_C(JavaThread* thread))
    zap_dead_java_or_native_locals(thread, is_native_frame);
  JRT_END
  
  # endif
+