src/hotspot/share/jvmci/jvmciEnv.cpp

rev 56098 : imported patch 8226705-8221734-baseline

*** 29,38 ****
--- 29,39 ----
  #include "memory/oopFactory.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/typeArrayOop.inline.hpp"
+ #include "runtime/deoptimization.hpp"
  #include "runtime/jniHandles.inline.hpp"
  #include "runtime/javaCalls.hpp"
  #include "jvmci/jniAccessMark.inline.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  
*** 1489,1500 ****
    nmethodLocker nml(nm);
    if (nm->is_alive()) {
      // Invalidating the HotSpotNmethod means we want the nmethod
      // to be deoptimized.
      nm->mark_for_deoptimization();
!     VM_Deoptimize op;
!     VMThread::execute(&op);
    }
  
    // A HotSpotNmethod instance can only reference a single nmethod
    // during its lifetime so simply clear it here.
    set_InstalledCode_address(mirror, 0);
--- 1490,1500 ----
    nmethodLocker nml(nm);
    if (nm->is_alive()) {
      // Invalidating the HotSpotNmethod means we want the nmethod
      // to be deoptimized.
      nm->mark_for_deoptimization();
!     Deoptimization::deoptimize_all_marked();
    }
  
    // A HotSpotNmethod instance can only reference a single nmethod
    // during its lifetime so simply clear it here.
    set_InstalledCode_address(mirror, 0);