src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp

*** 139,148 ****
--- 139,149 ----
  void BarrierSetNMethod::disarm(nmethod* nm) {
    if (!supports_entry_barrier(nm)) {
      return;
    }
  
+   assert(is_armed(nm), "Should be armed");
    NativeNMethodCmpBarrier* cmp = native_nmethod_barrier(nm);
    cmp->set_immediate(disarmed_value());
  }
  
  bool BarrierSetNMethod::is_armed(nmethod* nm) {