Fix compilation after merging.

Author: wks

gc/default/default.c

@@ -2610,7 +2610,7 @@ rb_gc_impl_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags
         // We first calculate the object size if the object were allocated using Ruby's own GC.
         size_t size_pool_size = heap_slot_size(heap_idx);
         RUBY_ASSERT(size_pool_size % MMTK_MIN_OBJ_ALIGN == 0);
-        return rb_mmtk_new_obj(objspace_ptr, cache_ptr, klass, flags, v1, v2, v3, wb_protected, alloc_size, size_pool_size);
+        return rb_mmtk_new_obj(objspace_ptr, cache_ptr, klass, flags, wb_protected, alloc_size, size_pool_size);
     })
 
     rb_ractor_newobj_cache_t *cache = (rb_ractor_newobj_cache_t *)cache_ptr;
@@ -2976,7 +2976,7 @@ void
 rb_mmtk_each_object_safe(void (*func)(VALUE, void *), void *data)
 {
     // Allocate a tmpbuf object.  It's OK if it triggers GC now.
-    volatile VALUE tmpbuf = rb_imemo_tmpbuf_auto_free_pointer();
+    volatile VALUE tmpbuf = rb_imemo_tmpbuf_new();
 
     // Build an array of object references.
     const size_t initial_capacity = 512;

internal/mmtk_support.h

@@ -86,7 +86,7 @@ size_t rb_mmtk_get_payload_size(VALUE object);
 
 // Allocation
 VALUE
-rb_mmtk_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size, size_t size_pool_size);
+rb_mmtk_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, bool wb_protected, size_t alloc_size, size_t size_pool_size);
 
 // Write barrier
 void rb_mmtk_object_reference_write_post(struct rb_mmtk_mutator_local *local, MMTk_ObjectReference object);

mmtk_support.c

@@ -560,7 +560,7 @@ rb_mmtk_new_obj_raw(struct rb_mmtk_mutator_local *local, VALUE klass, VALUE flag
 // Use this to allocate any other Ruby objects.
 // Copied from mmtk.c, with lots of modification.
 VALUE
-rb_mmtk_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, bool wb_protected, size_t alloc_size, size_t size_pool_size)
+rb_mmtk_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, bool wb_protected, size_t alloc_size, size_t size_pool_size)
 {
     #define MMTK_ALLOCATION_SEMANTICS_DEFAULT 0
     // struct objspace *objspace = objspace_ptr;
@@ -574,11 +574,6 @@ rb_mmtk_new_obj(void *objspace_ptr, void *cache_ptr, VALUE klass, VALUE flags, V
     // We just let default.c work out the size pool size and we shall allocate that size.
     VALUE obj = rb_mmtk_new_obj_raw(local, klass, flags, wb_protected, size_pool_size);
 
-    VALUE *alloc_obj = (VALUE*)obj;
-    if (alloc_size > 16) alloc_obj[2] = v1;
-    if (alloc_size > 24) alloc_obj[3] = v2;
-    if (alloc_size > 32) alloc_obj[4] = v3;
-
     rb_mmtk_maybe_register_initial_obj_free_candidate(local, obj);
     rb_mmtk_maybe_register_initial_ppp(local, obj);