MMTk: Rename GIVTBL to gen fields tbl

The upstream renamed `generic_iv_tbl_` to `generic_fields_tbl_`, and the
struct `gen_ivtbl` to `gen_fields_tbl`.  We rename accordingly.

Author: wks

internal/mmtk.h

@@ -80,16 +80,17 @@ typedef struct MMTk_RubyUpcalls {
     void (*scan_object_ruby_style)(MMTk_ObjectReference object);
     void (*call_gc_mark_children)(MMTk_ObjectReference object);
     void (*call_obj_free)(MMTk_ObjectReference object);
-    void (*cleanup_generic_iv_tbl)(void);
-    void *(*get_original_givtbl)(MMTk_ObjectReference object);
-    void (*move_givtbl)(MMTk_ObjectReference old_objref, MMTk_ObjectReference new_objref);
+    void (*cleanup_generic_fields_tbl)(void);
+    void *(*get_original_gen_fields_tbl)(MMTk_ObjectReference object);
+    void (*reinsert_generic_fields_tbl_entry)(MMTk_ObjectReference old_objref,
+                                              MMTk_ObjectReference new_objref);
     size_t (*vm_live_bytes)(void);
     void (*update_frozen_strings_table)(void);
     void (*update_finalizer_and_obj_id_tables)(void);
     void (*update_global_symbols_table)(void);
     void (*update_overloaded_cme_table)(void);
     void (*update_ci_table)(void);
-    struct st_table *(*get_generic_iv_tbl)(void);
+    struct st_table *(*get_generic_fields_tbl)(void);
     size_t (*get_num_fstrings)(void);
     struct st_table *(*get_finalizer_table)(void);
     struct st_table *(*get_id2ref_table)(void);
@@ -242,7 +243,7 @@ void mmtk_register_ppp(MMTk_ObjectReference object);
 
 void mmtk_register_ppps(const MMTk_ObjectReference *objects, size_t len);
 
-void *mmtk_get_givtbl_during_gc(MMTk_ObjectReference object);
+void *mmtk_get_gen_fields_tbl_during_gc(MMTk_ObjectReference object);
 
 size_t mmtk_get_vo_bit_log_region_size(void);
 

mmtk_support.c

@@ -1742,7 +1742,7 @@ rb_mmtk_scan_roots_in_mutator_thread(MMTk_VMMutatorThread vm_mutator, MMTk_VMWor
 }
 
 static void*
-rb_mmtk_get_original_givtbl(MMTk_ObjectReference object) {
+rb_mmtk_get_original_gen_fields_tbl(MMTk_ObjectReference object) {
     VALUE obj = (VALUE)object;
 
     RUBY_ASSERT(FL_TEST(obj, FL_EXIVAR));
@@ -1752,18 +1752,18 @@ rb_mmtk_get_original_givtbl(MMTk_ObjectReference object) {
 struct st_table *rb_generic_fields_tbl_get(void); // Defined in variable.c
 
 st_table*
-rb_mmtk_get_generic_iv_tbl(void) {
+rb_mmtk_get_generic_fields_tbl(void) {
     return rb_generic_fields_tbl_get();
 }
 
-void rb_mmtk_mv_generic_ivar(VALUE src, VALUE dst); // Defined in variable.c
+void rb_mmtk_reinsert_generic_fields_tbl_entry(VALUE src, VALUE dst); // Defined in variable.c
 
 static void
-rb_mmtk_move_givtbl(MMTk_ObjectReference old_objref, MMTk_ObjectReference new_objref) {
-    rb_mmtk_mv_generic_ivar((VALUE)old_objref, (VALUE)new_objref);
+rb_mmtk_reinsert_generic_fields_tbl_entry_wrapper(MMTk_ObjectReference old_objref, MMTk_ObjectReference new_objref) {
+    rb_mmtk_reinsert_generic_fields_tbl_entry((VALUE)old_objref, (VALUE)new_objref);
 }
 
-void rb_mmtk_cleanup_generic_iv_tbl(void); // Defined in variable.c
+void rb_mmtk_cleanup_generic_fields_tbl(void); // Defined in variable.c
 void rb_mmtk_update_frozen_strings_table(void); // Defined in default.c
 void rb_mmtk_update_finalizer_and_obj_id_tables(void); // Defined in default.c
 void rb_mmtk_update_global_symbols_table(void); // Defined in gc.c
@@ -1799,16 +1799,16 @@ MMTk_RubyUpcalls ruby_upcalls = {
     rb_mmtk_scan_object_ruby_style,
     rb_mmtk_call_gc_mark_children,
     rb_mmtk_call_obj_free,
-    rb_mmtk_cleanup_generic_iv_tbl,
-    rb_mmtk_get_original_givtbl,
-    rb_mmtk_move_givtbl,
+    rb_mmtk_cleanup_generic_fields_tbl,
+    rb_mmtk_get_original_gen_fields_tbl,
+    rb_mmtk_reinsert_generic_fields_tbl_entry_wrapper,
     rb_mmtk_vm_live_bytes,
     rb_mmtk_update_frozen_strings_table,
     rb_mmtk_update_finalizer_and_obj_id_tables,
     rb_mmtk_update_global_symbols_table,
     rb_mmtk_update_overloaded_cme_table,
     rb_mmtk_update_ci_table,
-    rb_mmtk_get_generic_iv_tbl,
+    rb_mmtk_get_generic_fields_tbl,
     rb_mmtk_debug_get_num_fstrings,
     rb_mmtk_get_finalizer_table,
     rb_mmtk_get_id2ref_table,

variable.c

@@ -1303,7 +1303,7 @@ rb_mark_generic_ivar(VALUE obj)
 void
 rb_mmtk_update_generic_ivar(VALUE obj)
 {
-    struct gen_fields_tbl *fields_tbl = (struct gen_fields_tbl *)mmtk_get_givtbl_during_gc((MMTk_ObjectReference)obj);
+    struct gen_fields_tbl *fields_tbl = (struct gen_fields_tbl *)mmtk_get_gen_fields_tbl_during_gc((MMTk_ObjectReference)obj);
     if (fields_tbl != NULL) {
         if (rb_shape_obj_too_complex_p(obj)) {
             rb_gc_update_tbl_refs(fields_tbl->as.complex.table);
@@ -1317,22 +1317,22 @@ rb_mmtk_update_generic_ivar(VALUE obj)
 }
 
 void
-rb_mmtk_mv_generic_ivar(VALUE rsrc, VALUE dst)
+rb_mmtk_reinsert_generic_fields_tbl_entry(VALUE rsrc, VALUE dst)
 {
     st_data_t key = (st_data_t)rsrc;
-    st_data_t ivtbl;
+    st_data_t fields_tbl;
 
-    if (st_delete(generic_fields_tbl_no_ractor_check(rsrc), &key, &ivtbl))
-        st_insert(generic_fields_tbl_no_ractor_check(dst), (st_data_t)dst, ivtbl);
+    if (st_delete(generic_fields_tbl_no_ractor_check(rsrc), &key, &fields_tbl))
+        st_insert(generic_fields_tbl_no_ractor_check(dst), (st_data_t)dst, fields_tbl);
 }
 
 static int
-rb_mmtk_cleanup_generic_iv_tbl_check(st_data_t key, st_data_t value, st_data_t argp, int error)
+rb_mmtk_cleanup_generic_fields_tbl_check(st_data_t key, st_data_t value, st_data_t argp, int error)
 {
     MMTk_ObjectReference key_objref = (MMTk_ObjectReference)key;
-    // Delete gen_ivtbl for dead objects.
+    // Delete gen_fields_tbl for dead objects.
     if (!mmtk_is_live_object(key_objref)) {
-        struct gen_ivtbl *tbl = (struct gen_ivtbl*)value;
+        struct gen_fields_tbl *tbl = (struct gen_fields_tbl*)value;
         RUBY_ASSERT(tbl != NULL);
         xfree(tbl);
 
@@ -1349,15 +1349,15 @@ rb_mmtk_cleanup_generic_iv_tbl_check(st_data_t key, st_data_t value, st_data_t a
 }
 
 /**
- * Remove entries in generic_iv_tbl_ where the key is dead.
- * Only used when using MMTk.  In vanilla Ruby, the gen_ivtbl of an object is
- * removed from generic_iv_tbl_ in obj_free when the object dies.
+ * Remove entries in generic_fields_tbl_ where the key is dead.
+ * Only used when using MMTk.  In vanilla Ruby, the gen_fields_tbl of an object is
+ * removed from generic_fields_tbl_ in obj_free when the object dies.
  */
 void
-rb_mmtk_cleanup_generic_iv_tbl(void)
+rb_mmtk_cleanup_generic_fields_tbl(void)
 {
     st_foreach_with_replace(generic_fields_tbl_,
-                            rb_mmtk_cleanup_generic_iv_tbl_check,
+                            rb_mmtk_cleanup_generic_fields_tbl_check,
                             NULL,
                             0);
 }