1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass allocation size to rb_imemo_new

Browse Source 
This would allow imemo to take advantage of VWA and allocate sizes larger
than RVALUE (40 bytes).
This commit is contained in:
Peter Zhu 2025-01-07 11:00:16 -05:00
parent 051af9529b
commit 62a1528020
Notes: git 2025-01-08 14:12:18 +00:00 
Merged: https://github.com/ruby/ruby/pull/12524
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imemo.c
View File

@ -40,9 +40,8 @@ rb_imemo_name(enum imemo_type type)
* ========================================================================= */ * ========================================================================= */
VALUE VALUE
rb_imemo_new(enum imemo_type type, VALUE v0) rb_imemo_new(enum imemo_type type, VALUE v0, size_t size)
{ {
size_t size = RVALUE_SIZE;
VALUE flags = T_IMEMO | FL_WB_PROTECTED | (type << FL_USHIFT); VALUE flags = T_IMEMO | FL_WB_PROTECTED | (type << FL_USHIFT);
NEWOBJ_OF(obj, void, v0, flags, size, 0); NEWOBJ_OF(obj, void, v0, flags, size, 0);

6
internal/imemo.h
View File

@ -115,7 +115,7 @@ struct MEMO {
} u3; } u3;
}; };
#define IMEMO_NEW(T, type, v0) ((T *)rb_imemo_new((type), (v0))) #define IMEMO_NEW(T, type, v0) ((T *)rb_imemo_new((type), (v0), sizeof(T)))
/* ment is in method.h */ /* ment is in method.h */
@ -152,7 +152,7 @@ void rb_cc_table_free(VALUE klass);
void rb_imemo_free(VALUE obj); void rb_imemo_free(VALUE obj);
RUBY_SYMBOL_EXPORT_BEGIN RUBY_SYMBOL_EXPORT_BEGIN
VALUE rb_imemo_new(enum imemo_type type, VALUE v0); VALUE rb_imemo_new(enum imemo_type type, VALUE v0, size_t size);
const char *rb_imemo_name(enum imemo_type type); const char *rb_imemo_name(enum imemo_type type);
RUBY_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END
@ -205,7 +205,7 @@ rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data)
static inline VALUE static inline VALUE
rb_imemo_tmpbuf_auto_free_pointer(void) rb_imemo_tmpbuf_auto_free_pointer(void)
{ {
return rb_imemo_new(imemo_tmpbuf, 0); return rb_imemo_new(imemo_tmpbuf, 0, sizeof(rb_imemo_tmpbuf_t));
} }
static inline void * static inline void *