summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: e3336e0)
rawpatchinlineside by side (parent: e3336e0)
| author | Peter Zhu <[email protected]> | |
| Mon, 16 Jan 2023 16:50:00 +0000 (16 11:50 -0500) | ||
| committer | Peter Zhu <[email protected]> | |
| Wed, 18 Jan 2023 13:49:32 +0000 (18 08:49 -0500) |
RB_OBJ_WRITE already exists in rgengc.h, so we shouldn't redefine it in
gc.h.
gc.h.
diff --git a/internal.h b/internal.h
--- a/internal.h
+++ b/internal.h
/* internal/gc.h */
#undef NEWOBJ_OF
#undef RB_NEWOBJ_OF
-#undef RB_OBJ_WRITE
/* internal/hash.h */
#undef RHASH_IFNONE
diff --git a/internal/class.h b/internal/class.h
--- a/internal/class.h
+++ b/internal/class.h
* @brief Internal header for Class.
*/
#include "id_table.h" /* for struct rb_id_table */
-#include "internal/gc.h" /* for RB_OBJ_WRITE */
#include "internal/serial.h" /* for rb_serial_t */
#include "internal/static_assert.h"
#include "ruby/internal/stdbool.h" /* for bool */
diff --git a/internal/gc.h b/internal/gc.h
--- a/internal/gc.h
+++ b/internal/gc.h
#ifdef NEWOBJ_OF
# undef NEWOBJ_OF
# undef RB_NEWOBJ_OF
-# undef RB_OBJ_WRITE
#endif
#define RVALUE_SIZE (sizeof(struct RBasic) + sizeof(VALUE[RBIMPL_RVALUE_EMBED_LEN_MAX]))
#endif
#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem)
-#define RB_OBJ_WRITE(a, slot, b) \
- rb_obj_write((VALUE)(a), UNALIGNED_MEMBER_ACCESS((VALUE *)(slot)), \
- (VALUE)(b), __FILE__, __LINE__)
// We use SIZE_POOL_COUNT number of shape IDs for transitions out of different size pools
// The next available shapd ID will be the SPECIAL_CONST_SHAPE_ID
diff --git a/internal/imemo.h b/internal/imemo.h
--- a/internal/imemo.h
+++ b/internal/imemo.h
#include "ruby/internal/config.h"
#include <stddef.h> /* for size_t */
#include "internal/array.h" /* for rb_ary_hidden_new_fill */
-#include "internal/gc.h" /* for RB_OBJ_WRITE */
#include "ruby/internal/stdbool.h" /* for bool */
#include "ruby/ruby.h" /* for rb_block_call_func_t */
diff --git a/internal/process.h b/internal/process.h
--- a/internal/process.h
+++ b/internal/process.h
#endif
#include "ruby/ruby.h" /* for VALUE */
+#include "internal/compilers.h" /* for __has_warning */
#include "internal/imemo.h" /* for RB_IMEMO_TMPBUF_PTR */
#include "internal/warnings.h" /* for COMPILER_WARNING_PUSH */
diff --git a/internal/rational.h b/internal/rational.h
--- a/internal/rational.h
+++ b/internal/rational.h
*/
#include "ruby/internal/config.h" /* for HAVE_LIBGMP */
#include "ruby/ruby.h" /* for struct RBasic */
-#include "internal/gc.h" /* for RB_OBJ_WRITE */
#include "internal/numeric.h" /* for INT_POSITIVE_P */
#include "ruby_assert.h" /* for assert */
diff --git a/internal/struct.h b/internal/struct.h
--- a/internal/struct.h
+++ b/internal/struct.h
* @brief Internal header for Struct.
*/
#include "ruby/internal/stdbool.h" /* for bool */
-#include "internal/gc.h" /* for RB_OBJ_WRITE */
#include "ruby/ruby.h" /* for struct RBasic */
enum {
diff --git a/thread_sync.c b/thread_sync.c
--- a/thread_sync.c
+++ b/thread_sync.c
if ((argc = rb_scan_args(argc, argv, "01", &initial)) == 1) {
initial = rb_to_array(initial);
}
- RB_OBJ_WRITE(self, &q->que, ary_buf_new());
+ RB_OBJ_WRITE(self, UNALIGNED_MEMBER_ACCESS(&q->que), ary_buf_new());
ccan_list_head_init(queue_waitq(q));
if (argc == 1) {
rb_ary_concat(q->que, initial);
rb_raise(rb_eArgError, "queue size must be positive");
}
- RB_OBJ_WRITE(self, &sq->q.que, ary_buf_new());
+ RB_OBJ_WRITE(self, UNALIGNED_MEMBER_ACCESS(&sq->q.que), ary_buf_new());
ccan_list_head_init(szqueue_waitq(sq));
ccan_list_head_init(szqueue_pushq(sq));
sq->max = max;