Merge pull request ruby#185 from Shopify/fix-invalidation-clear

tenderworks · web-flow · commit 0074c0a9b463 · 2021-08-26T12:34:57.000-07:00
Only clear the JIT function when we invalidate the entry block
diff --git a/yjit_core.c b/yjit_core.c
@@ -1114,7 +1114,14 @@ invalidate_block_version(block_t* block)
     // interpreter will run the iseq
 
 #if JIT_ENABLED
-    iseq->body->jit_func = 0;
+    // Only clear the jit_func when we're invalidating the JIT entry block.
+    // We only support compiling iseqs from index 0 right now.  So entry
+    // points will always have an instruction index of 0.  We'll need to
+    // change this in the future when we support optional parameters because
+    // they enter the function with a non-zero PC
+    if (block->blockid.idx == 0) {
+        iseq->body->jit_func = 0;
+    }
 #endif
 
     // TODO:
