Merge pull request ruby#109 from Shopify/yjit-diff-local-types

maximecb · web-flow · commit 991f56d519c4 · 2021-04-13T15:27:16.000-04:00
Diff the local types in ctx_diff()
diff --git a/yjit_core.c b/yjit_core.c
@@ -13,7 +13,7 @@
 #define MAX_VERSIONS 4
 
 // Maximum number of branch instructions we can track
-#define MAX_BRANCHES 100000
+#define MAX_BRANCHES 250000
 
 // Registered branch entries
 branch_t branch_entries[MAX_BRANCHES];
@@ -284,7 +284,18 @@ int ctx_diff(const ctx_t* src, const ctx_t* dst)
 
     diff += self_diff;
 
-    // TODO: when we track local types, need to check them too
+    // For each local type we track
+    for (size_t i = 0; i < MAX_LOCAL_TYPES; ++i)
+    {
+        val_type_t t_src = src->local_types[i];
+        val_type_t t_dst = dst->local_types[i];
+        int temp_diff = type_diff(t_src, t_dst);
+
+        if (temp_diff == INT_MAX)
+            return INT_MAX;
+
+        diff += temp_diff;
+    }
 
     // For each value on the temp stack
     for (size_t i = 0; i < src->stack_size; ++i)
@@ -659,7 +670,6 @@ void gen_branch(
 )
 {
     RUBY_ASSERT(target0.iseq != NULL);
-    //RUBY_ASSERT(target1.iseq != NULL);
     RUBY_ASSERT_ALWAYS(num_branches < MAX_BRANCHES);
     uint32_t branch_idx = num_branches++;
 
@@ -879,7 +889,7 @@ invalidate_block_version(block_t* block)
 
     // For each incoming branch
     uint32_t* branch_idx;
-    rb_darray_foreach(block->incoming, i, branch_idx)
+    rb_darray_foreach(block->incoming, incoming_idx, branch_idx)
     {
         //uint32_t branch_idx = block->incoming[i];
         branch_t* branch = &branch_entries[*branch_idx];
