src/hotspot/share/prims/methodHandles.cpp

rev 54621 : imported patch 8221734-v1

*** 37,46 ****
--- 37,47 ----
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayOop.inline.hpp"
  #include "prims/methodHandles.hpp"
  #include "runtime/compilationPolicy.hpp"
+ #include "runtime/deoptimization.hpp"
  #include "runtime/fieldDescriptor.inline.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/jniHandles.inline.hpp"
*** 1104,1115 ****
      DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context);
      marked = deps.mark_dependent_nmethods(changes);
    }
    if (marked > 0) {
      // At least one nmethod has been marked for deoptimization.
!     VM_Deoptimize op;
!     VMThread::execute(&op);
    }
  }
  
  void MethodHandles::trace_method_handle_interpreter_entry(MacroAssembler* _masm, vmIntrinsics::ID iid) {
    if (TraceMethodHandles) {
--- 1105,1115 ----
      DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context);
      marked = deps.mark_dependent_nmethods(changes);
    }
    if (marked > 0) {
      // At least one nmethod has been marked for deoptimization.
!     Deoptimization::deoptimize_all_marked();
    }
  }
  
  void MethodHandles::trace_method_handle_interpreter_entry(MacroAssembler* _masm, vmIntrinsics::ID iid) {
    if (TraceMethodHandles) {
*** 1501,1512 ****
        DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context());
        marked = deps.remove_all_dependents();
      }
      if (marked > 0) {
        // At least one nmethod has been marked for deoptimization
!       VM_Deoptimize op;
!       VMThread::execute(&op);
      }
    }
  }
  JVM_END
  
--- 1501,1511 ----
        DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context());
        marked = deps.remove_all_dependents();
      }
      if (marked > 0) {
        // At least one nmethod has been marked for deoptimization
!       Deoptimization::deoptimize_all_marked();
      }
    }
  }
  JVM_END