Merge pull request ruby#110 from Shopify/remove-invalidation

tenderworks · web-flow · commit e415972f87c1 · 2021-06-29T08:22:48.000-07:00
Partial revert of ceebc7f
diff --git a/gc.c b/gc.c
@@ -2913,7 +2913,7 @@ vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, rb_objspace_t *objspace,
                     asan_poison_object((VALUE)cc);
                 }
             }
-            rb_vm_cc_invalidate(cc);
+            vm_cc_invalidate(cc);
         }
         ruby_xfree(ccs->entries);
     }
diff --git a/vm_callinfo.h b/vm_callinfo.h
@@ -410,7 +410,16 @@ vm_cc_method_missing_reason_set(const struct rb_callcache *cc, enum method_missi
     *(enum method_missing_reason *)&cc->aux_.method_missing_reason = reason;
 }
 
-void rb_vm_cc_invalidate(const struct rb_callcache *cc);
+static inline void
+vm_cc_invalidate(const struct rb_callcache *cc)
+{
+    VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
+    VM_ASSERT(cc != vm_cc_empty());
+    VM_ASSERT(cc->klass != 0); // should be enable
+
+    *(VALUE *)&cc->klass = 0;
+    RB_DEBUG_COUNTER_INC(cc_ent_invalidate);
+}
 
 /* calldata */
 
diff --git a/vm_method.c b/vm_method.c
@@ -115,18 +115,6 @@ rb_vm_mtbl_dump(const char *msg, VALUE klass, ID target_mid)
     vm_mtbl_dump(klass, target_mid);
 }
 
-void
-rb_vm_cc_invalidate(const struct rb_callcache *cc)
-{
-    VM_ASSERT(IMEMO_TYPE_P(cc, imemo_callcache));
-    VM_ASSERT(cc != vm_cc_empty());
-    VM_ASSERT(cc->klass != 0); // should be enable
-
-    *(VALUE *)&cc->klass = 0;
-    RB_DEBUG_COUNTER_INC(cc_ent_invalidate);
-}
-
-
 static inline void
 vm_cme_invalidate(rb_callable_method_entry_t *cme)
 {

Original file line number	Diff line number	Diff line change
`@@ -2913,7 +2913,7 @@ vm_ccs_free(struct rb_class_cc_entries ccs, int alive, rb_objspace_t objspace,`
`2913`	`2913`	`asan_poison_object((VALUE)cc);`
`2914`	`2914`	`}`
`2915`	`2915`	`}`
`2916`		`- rb_vm_cc_invalidate(cc);`
	`2916`	`+ vm_cc_invalidate(cc);`
`2917`	`2917`	`}`
`2918`	`2918`	`ruby_xfree(ccs->entries);`
`2919`	`2919`	`}`