src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

*** 1037,1047 ****
    }
  
    if (result != JVMCIEnv::ok) {
      assert(cb == NULL, "should be");
    } else {
!     if (!installed_code_handle.is_null()) {
        assert(installed_code_handle->is_a(InstalledCode::klass()), "wrong type");
        nmethod::invalidate_installed_code(installed_code_handle, CHECK_0);
        {
          // Ensure that all updates to the InstalledCode fields are consistent.
          MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
--- 1037,1047 ----
    }
  
    if (result != JVMCIEnv::ok) {
      assert(cb == NULL, "should be");
    } else {
!     if (installed_code_handle.not_null()) {
        assert(installed_code_handle->is_a(InstalledCode::klass()), "wrong type");
        nmethod::invalidate_installed_code(installed_code_handle, CHECK_0);
        {
          // Ensure that all updates to the InstalledCode fields are consistent.
          MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
*** 1056,1072 ****
            HotSpotInstalledCode::set_size(installed_code_handle, cb->size());
            HotSpotInstalledCode::set_codeStart(installed_code_handle, (jlong) cb->code_begin());
            HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size());
          }
        }
-       nmethod* nm = cb->as_nmethod_or_null();
-       if (nm != NULL && installed_code_handle->is_scavengable()) {
-         assert(nm->detect_scavenge_root_oops(), "nm should be scavengable if installed_code is scavengable");
-         if (!UseG1GC) {
-           assert(nm->on_scavenge_root_list(), "nm should be on scavengable list");
-         }
-       }
      }
    }
    return result;
  C2V_END
  
--- 1056,1065 ----