[前][次][番号順一覧][スレッド一覧]

ruby-changes:61197

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Mon, 11 May 2020 16:48:35 +0900 (JST)
Subject: [ruby-changes:61197] 15e977349e (master): more on NULL versus functions

https://git.ruby-lang.org/ruby.git/commit/?id=15e977349e

From 15e977349e31389515bccf7a9684005a0c36e02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Mon, 11 May 2020 16:45:40 +0900
Subject: more on NULL versus functions

Function pointers are not void*.  See also
115fec062ccf7c6d72c8d5f64b7a5d84c9fb2dd8
ce4ea956d24eab5089a143bba38126f2b11b55b6
8427fca49bd85205f5a8766292dd893f003c0e48

diff --git a/gc.c b/gc.c
index 320de1c..76d112c 100644
--- a/gc.c
+++ b/gc.c
@@ -8228,7 +8228,7 @@ update_cc_tbl(rb_objspace_t *objspace, VALUE klass) https://github.com/ruby/ruby/blob/trunk/gc.c#L8228
 {
     struct rb_id_table *tbl = RCLASS_CC_TBL(klass);
     if (tbl) {
-        rb_id_table_foreach_with_replace(tbl, update_cc_tbl_i, NULL, objspace);
+        rb_id_table_foreach_with_replace(tbl, update_cc_tbl_i, 0, objspace);
     }
 }
 
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index b350e81..4d1d4ea 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2674,7 +2674,7 @@ vm_call_alias(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_cal https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2674
     struct rb_callcache cc_body;
     struct rb_call_data cd_body = {
         .ci = cd->ci,
-        .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL),
+        .cc = vm_cc_fill(&cc_body, Qundef, cme, 0),
     };
     return vm_call_method_each_type(ec, cfp, calling, &cd_body);
 }
@@ -2738,7 +2738,7 @@ vm_call_opt_send(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2738
     cd.cc = vm_cc_fill(&cc_body,
                        Qundef,
                        rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), mid, NULL),
-                       NULL);
+                       0);
     if (missing_reason != 0) vm_cc_method_missing_reason_set(cd.cc, missing_reason);
     return vm_call_method(ec, reg_cfp, calling, (CALL_DATA)&cd);
 }
@@ -2850,7 +2850,7 @@ vm_call_zsuper(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_ca https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2850
     struct rb_callcache cc_body;
     struct rb_call_data cd_body = {
         .ci = cd->ci,
-        .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL),
+        .cc = vm_cc_fill(&cc_body, Qundef, cme, 0),
     };
     return vm_call_method_each_type(ec, cfp, calling, &cd_body);
 
@@ -2964,7 +2964,7 @@ vm_call_refined(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_c https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2964
         struct rb_callcache cc_body;
         struct rb_call_data cd_body = {
             .ci = cd->ci,
-            .cc = vm_cc_fill(&cc_body, Qundef, cme, NULL),
+            .cc = vm_cc_fill(&cc_body, Qundef, cme, 0),
         };
         return vm_call_method(ec, cfp, calling, &cd_body);
     }
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]