fix WB related APIs.

Author: ko1

array.c

@@ -456,8 +456,9 @@ rb_ary_new4(long n, const VALUE *elts)
 
  ary = rb_ary_new2(n);
  if (n > 0 && elts) {
-/* new array is not old gen */
-MEMCPY(RARRAY_RAWPTR(ary), elts, VALUE, n);
+RARRAY_PTR_USE(ary, ptr, {
+ MEMCPY(ptr, elts, VALUE, n); /* new array is not old gen */
+});
 ARY_SET_LEN(ary, n);
  }
 
@@ -651,7 +652,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 
  rb_ary_modify(ary);
  if (argc == 0) {
-if (ARY_OWNS_HEAP_P(ary) && RARRAY_RAWPTR(ary)) {
+if (ARY_OWNS_HEAP_P(ary) && RARRAY_HAVE_PTR(ary)) {
  xfree(RARRAY_RAWPTR(ary));
 }
  rb_ary_unshare_safe(ary);
@@ -692,7 +693,11 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 }
  }
  else {
-memfill(RARRAY_RAWPTR(ary), len, val);
+if (0) memfill(RARRAY_RAWPTR(ary), len, val);
+
+RARRAY_PTR_USE(ary, ptr, {
+ memfill(ptr, len, val);
+});
 OBJ_WB(ary, val);
 ARY_SET_LEN(ary, len);
  }

error.c

@@ -310,7 +310,7 @@ rb_bug(const char *fmt, ...)
  _set_abort_behavior( 0, _CALL_REPORTFAULT);
 #endif
 
- if (0) {
+ if (1) {
 char buff[100];
 sprintf(buff, "gdb -p %d -x ../gitruby/.gdbinit", getpid());
 system(buff);

gc.c

@@ -5178,7 +5178,7 @@ rgengc_profile_report(rb_objspace_t *objspace)
 /* RGENGC: APIs */
 
 void
-rb_gc_wb(VALUE a, VALUE b)
+rb_gc_writebarrier(VALUE a, VALUE b)
 {
  rb_objspace_t *objspace = &rb_objspace;
 
@@ -5203,7 +5203,7 @@ rb_gc_wb(VALUE a, VALUE b)
  }
 }
 
-VALUE
+void
 rb_gc_giveup_writebarrier(VALUE obj)
 {
  rb_objspace_t *objspace = &rb_objspace;
@@ -5228,6 +5228,4 @@ rb_gc_giveup_writebarrier(VALUE obj)
  rgengc_remember(objspace, obj);
 
  objspace->rgengc.shade_operation_count++;
-
- return obj;
 }

include/ruby/ruby.h

@@ -694,11 +694,11 @@ struct RBasicRaw {
  VALUE klass;
 };
 
-#define RBASIC_CLEAR_CLASS(obj) (((struct RBasicRaw *)(obj))->klass = 0)
-#define RBASIC_SET_CLASS_RAW(obj, cls) (((struct RBasicRaw *)(obj))->klass = (cls))
+#define RBASIC_CLEAR_CLASS(obj) (((struct RBasicRaw *)((VALUE)(obj)))->klass = 0)
+#define RBASIC_SET_CLASS_RAW(obj, cls) (((struct RBasicRaw *)((VALUE)(obj)))->klass = (cls))
 #define RBASIC_SET_CLASS(obj, cls) do { \
- VALUE _obj_ = (obj); \
- VALUE _cls_ = (cls); \
+ VALUE _obj_ = (VALUE)(obj); \
+ VALUE _cls_ = (VALUE)(cls); \
  OBJ_WB(_obj_, _cls_); RBASIC_SET_CLASS_RAW(_obj_, _cls_); \
 } while (0)
 
@@ -901,11 +901,33 @@ struct RArray {
 
 #define RARRAY_LENINT(ary) rb_long2int(RARRAY_LEN(ary))
 
+/* DO NOT USE THIS MACRO DIRECTLY */
 #define RARRAY_RAWPTR(a) \
  ((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ? \
  RARRAY(a)->as.ary : \
  RARRAY(a)->as.heap.ptr)
 
+#define RARRAY_HAVE_PTR(a) (RARRAY_RAWPTR(a) == 0 ? 0 : 1)
+
+#define RARRAY_PTR_USE_START(a) RARRAY_RAWPTR(a)
+#define RARRAY_PTR_USE_END(a) /* */
+
+#define RARRAY_PTR_USE(ary, ptr_name, expr) do { \
+ const VALUE _ary = (ary); \
+ VALUE *ptr_name = RARRAY_PTR_USE_START(_ary); \
+ expr; \
+ RARRAY_PTR_USE_END(_ary); \
+} while (0)
+
+#define RARRAY_AREF(a, i) (RARRAY_RAWPTR(a)[i])
+#define RARRAY_ASET(a, i, v) do { \
+ const VALUE _ary = (a); \
+ const VALUE _val = (v); \
+ RARRAY_RAWPTR(OBJ_WB(_ary, _val))[i] = _val; \
+} while (0)
+
+#define RARRAY_PTR(a) RARRAY_RAWPTR(OBJ_WB_GIVEUP((VALUE)a))
+
 struct RRegexp {
  struct RBasic basic;
  struct re_pattern_buffer *ptr;
@@ -1165,31 +1187,31 @@ struct RBignum {
 
 #define OBJ_PROMOTED(x) (SPECIAL_CONST_P(x) ? 0 : FL_TEST_RAW((x), FL_OLDGEN))
 #define OBJ_WB_PROTECTED(x) (SPECIAL_CONST_P(x) ? 1 : FL_TEST_RAW((x), FL_KEEP_WB))
+#define OBJ_WB_GIVEUP(x) rb_obj_wb_giveup(x)
 #define OBJ_SHADE(x) OBJ_WB_GIVEUP(x) /* RGENGC terminology */
+#define OBJ_WB(a, b) rb_obj_wb((a), (b))
 
-void rb_gc_wb(VALUE a, VALUE b);
-VALUE rb_gc_giveup_writebarrier(VALUE obj);
+void rb_gc_writebarrier(VALUE a, VALUE b);
+void rb_gc_giveup_writebarrier(VALUE obj);
 
 static inline VALUE
-OBJ_WB_GIVEUP(VALUE x)
+rb_obj_wb_giveup(VALUE x)
 {
  if (OBJ_WB_PROTECTED(x) && OBJ_PROMOTED(x)) {
 rb_gc_giveup_writebarrier(x);
  }
  return x;
 }
 
-#define OBJ_WB(a, b) (!SPECIAL_CONST_P(b) && OBJ_PROMOTED(a) && !OBJ_PROMOTED(b) && (rb_gc_wb((a), (b)), 1))
-
-#define RARRAY_AREF(a, i) (RARRAY_RAWPTR(a)[i])
-static inline void
-RARRAY_ASET(VALUE a, long index, VALUE v) {
- OBJ_WB(a, v);
- RARRAY_RAWPTR(a)[index] = v;
+static inline VALUE
+rb_obj_wb(VALUE a, VALUE b)
+{
+ if (!SPECIAL_CONST_P(b) && !OBJ_PROMOTED(b) && OBJ_PROMOTED(a)) {
+rb_gc_writebarrier(a, b);
+ }
+ return a;
 }
 
-#define RARRAY_PTR(a) RARRAY_RAWPTR(OBJ_WB_GIVEUP((VALUE)a))
-
 #if SIZEOF_INT < SIZEOF_LONG
 # define INT2NUM(v) INT2FIX((int)(v))
 # define UINT2NUM(v) LONG2FIX((unsigned int)(v))