1 files changed, 8 insertions, 1 deletions
diff --git a/mjit.c b/mjit.c
index 0346d034db..a0310ae96c 100644
--- a/mjit.c
+++ b/mjit.c
@@ -297,7 +297,14 @@ unload_units(void)
         remove_from_list(worst, &active_units);
         free_unit(worst);
     }
-    verbose(1, "Too many JIT code -- %d units unloaded", units_num - active_units.length);
+
+    if (units_num == active_units.length && mjit_opts.wait) {
+        mjit_opts.max_cache_size++; // avoid infinite loop on `rb_mjit_wait_call`. Note that --jit-wait is just for testing.
+        verbose(1, "No units can be unloaded -- incremented max-cache-size to %d for --jit-wait", mjit_opts.max_cache_size);
+    }
+    else {
+        verbose(1, "Too many JIT code -- %d units unloaded", units_num - active_units.length);
+    }
 }
 
 /* Add ISEQ to be JITed in parallel with the current thread.