From ba11a74745e10fac88a74c2da2e0032ccf254265 Mon Sep 17 00:00:00 2001
From: 卜部昌平 <shyouhei@ruby-lang.org>
Date: Mon, 16 Dec 2019 17:38:41 +0900
Subject: ensure cc->def == cc->me->def

The equation shall hold for every call cache.  However prior to this
changeset cc->me could be updated without also updating cc->def.  Let's
make it sure by introducing new macro named CC_SET_ME which sets cc->me
and cc->def at once.
---
 vm_insnhelper.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'vm_insnhelper.c')

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 8487886886..e7e20ee3ca 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2655,7 +2655,7 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct
 	DEC_SP(1);
     }
 
-    cc->me = rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid, NULL);
+    CC_SET_ME(cc, rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid, NULL));
     ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND | (calling->kw_splat ? VM_CALL_KW_SPLAT : 0);
     return vm_call_method(ec, reg_cfp, calling, (CALL_DATA)&cd);
 }
@@ -2752,14 +2752,14 @@ vm_call_zsuper(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca
     const struct rb_call_info *ci = &cd->ci;
     struct rb_call_cache *cc = &cd->cc;
     klass = RCLASS_SUPER(klass);
-    cc->me = klass ? rb_callable_method_entry(klass, ci->mid) : NULL;
+    CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, ci->mid) : NULL);
 
     if (!cc->me) {
         return vm_call_method_nome(ec, cfp, calling, cd);
     }
     if (cc->me->def->type == VM_METHOD_TYPE_REFINED &&
 	cc->me->def->body.refined.orig_me) {
-	cc->me = refined_method_callable_without_refinement(cc->me);
+        CC_SET_ME(cc, refined_method_callable_without_refinement(cc->me));
     }
     return vm_call_method_each_type(ec, cfp, calling, cd);
 }
@@ -2885,24 +2885,24 @@ search_refined_method(rb_execution_context_t *ec, rb_control_frame_t *cfp, ID mi
             }
             if (cc->me->def->type != VM_METHOD_TYPE_REFINED ||
                 cc->me->def != ref_me->def) {
-                cc->me = ref_me;
+                CC_SET_ME(cc, ref_me);
             }
             if (ref_me->def->type != VM_METHOD_TYPE_REFINED) {
                 return TRUE;
             }
         }
         else {
-            cc->me = NULL;
+            CC_SET_ME(cc, NULL);
             return FALSE;
         }
     }
 
     if (cc->me->def->body.refined.orig_me) {
-        cc->me = refined_method_callable_without_refinement(cc->me);
+        CC_SET_ME(cc, refined_method_callable_without_refinement(cc->me));
     }
     else {
         VALUE klass = RCLASS_SUPER(cc->me->defined_class);
-        cc->me = klass ? rb_callable_method_entry(klass, mid) : NULL;
+        CC_SET_ME(cc, klass ? rb_callable_method_entry(klass, mid) : NULL);
     }
     return TRUE;
 }
@@ -2955,7 +2955,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st
         return vm_call_bmethod(ec, cfp, calling, cd);
 
       case VM_METHOD_TYPE_ALIAS:
-	cc->me = aliased_callable_method_entry(cc->me);
+        CC_SET_ME(cc, aliased_callable_method_entry(cc->me));
 	VM_ASSERT(cc->me != NULL);
         return vm_call_method_each_type(ec, cfp, calling, cd);
 
@@ -3156,7 +3156,7 @@ vm_search_super_method(const rb_control_frame_t *reg_cfp, struct rb_call_data *c
     }
     else {
         /* TODO: use inline cache */
-	cc->me = rb_callable_method_entry(klass, ci->mid);
+        CC_SET_ME(cc, rb_callable_method_entry(klass, ci->mid));
         CC_SET_FASTPATH(cc, vm_call_super_method, TRUE);
     }
 }
-- 
cgit v1.2.3