diff options
| -rw-r--r-- | debug_counter.h | 1 | ||||
| -rw-r--r-- | ext/objspace/objspace.c | 1 | ||||
| -rw-r--r-- | imemo.c | 9 | ||||
| -rw-r--r-- | internal/imemo.h | 9 | ||||
| -rw-r--r-- | yjit/src/cruby_bindings.inc.rs | 9 | ||||
| -rw-r--r-- | zjit/src/cruby_bindings.inc.rs | 9 |
6 files changed, 12 insertions, 26 deletions
diff --git a/debug_counter.h b/debug_counter.h index fada7513aa..9f0649e0ac 100644 --- a/debug_counter.h +++ b/debug_counter.h @@ -311,7 +311,6 @@ RB_DEBUG_COUNTER(obj_imemo_svar) RB_DEBUG_COUNTER(obj_imemo_throw_data) RB_DEBUG_COUNTER(obj_imemo_ifunc) RB_DEBUG_COUNTER(obj_imemo_memo) -RB_DEBUG_COUNTER(obj_imemo_parser_strterm) RB_DEBUG_COUNTER(obj_imemo_callinfo) RB_DEBUG_COUNTER(obj_imemo_callcache) RB_DEBUG_COUNTER(obj_imemo_constcache) diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index a61b1acbb4..8476c9b747 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -501,7 +501,6 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self) INIT_IMEMO_TYPE_ID(imemo_iseq); INIT_IMEMO_TYPE_ID(imemo_tmpbuf); INIT_IMEMO_TYPE_ID(imemo_ast); - INIT_IMEMO_TYPE_ID(imemo_parser_strterm); INIT_IMEMO_TYPE_ID(imemo_callinfo); INIT_IMEMO_TYPE_ID(imemo_callcache); INIT_IMEMO_TYPE_ID(imemo_constcache); @@ -26,7 +26,6 @@ rb_imemo_name(enum imemo_type type) IMEMO_NAME(iseq); IMEMO_NAME(memo); IMEMO_NAME(ment); - IMEMO_NAME(parser_strterm); IMEMO_NAME(svar); IMEMO_NAME(throw_data); IMEMO_NAME(tmpbuf); @@ -249,8 +248,6 @@ rb_imemo_memsize(VALUE obj) size += sizeof(((rb_method_entry_t *)obj)->def); break; - case imemo_parser_strterm: - break; case imemo_svar: break; case imemo_throw_data: @@ -460,8 +457,6 @@ rb_imemo_mark_and_move(VALUE obj, bool reference_updating) case imemo_ment: mark_and_move_method_entry((rb_method_entry_t *)obj, reference_updating); break; - case imemo_parser_strterm: - break; case imemo_svar: { struct vm_svar *svar = (struct vm_svar *)obj; @@ -658,10 +653,6 @@ rb_imemo_free(VALUE obj) RB_DEBUG_COUNTER_INC(obj_imemo_ment); break; - case imemo_parser_strterm: - RB_DEBUG_COUNTER_INC(obj_imemo_parser_strterm); - - break; case imemo_svar: RB_DEBUG_COUNTER_INC(obj_imemo_svar); diff --git a/internal/imemo.h b/internal/imemo.h index a7e01f31e1..dcea997ae8 100644 --- a/internal/imemo.h +++ b/internal/imemo.h @@ -38,11 +38,10 @@ enum imemo_type { imemo_iseq = 7, imemo_tmpbuf = 8, imemo_ast = 9, // Obsolete due to the universal parser - imemo_parser_strterm = 10, - imemo_callinfo = 11, - imemo_callcache = 12, - imemo_constcache = 13, - imemo_fields = 14, + imemo_callinfo = 10, + imemo_callcache = 11, + imemo_constcache = 12, + imemo_fields = 13, }; /* CREF (Class REFerence) is defined in method.h */ diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index 9b871c9e7c..666f5c4f28 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -406,11 +406,10 @@ pub const imemo_ment: imemo_type = 6; pub const imemo_iseq: imemo_type = 7; pub const imemo_tmpbuf: imemo_type = 8; pub const imemo_ast: imemo_type = 9; -pub const imemo_parser_strterm: imemo_type = 10; -pub const imemo_callinfo: imemo_type = 11; -pub const imemo_callcache: imemo_type = 12; -pub const imemo_constcache: imemo_type = 13; -pub const imemo_fields: imemo_type = 14; +pub const imemo_callinfo: imemo_type = 10; +pub const imemo_callcache: imemo_type = 11; +pub const imemo_constcache: imemo_type = 12; +pub const imemo_fields: imemo_type = 13; pub type imemo_type = u32; #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/zjit/src/cruby_bindings.inc.rs b/zjit/src/cruby_bindings.inc.rs index 9c860ab509..492de3a5df 100644 --- a/zjit/src/cruby_bindings.inc.rs +++ b/zjit/src/cruby_bindings.inc.rs @@ -223,11 +223,10 @@ pub const imemo_ment: imemo_type = 6; pub const imemo_iseq: imemo_type = 7; pub const imemo_tmpbuf: imemo_type = 8; pub const imemo_ast: imemo_type = 9; -pub const imemo_parser_strterm: imemo_type = 10; -pub const imemo_callinfo: imemo_type = 11; -pub const imemo_callcache: imemo_type = 12; -pub const imemo_constcache: imemo_type = 13; -pub const imemo_fields: imemo_type = 14; +pub const imemo_callinfo: imemo_type = 10; +pub const imemo_callcache: imemo_type = 11; +pub const imemo_constcache: imemo_type = 12; +pub const imemo_fields: imemo_type = 13; pub type imemo_type = u32; pub const METHOD_VISI_UNDEF: rb_method_visibility_t = 0; pub const METHOD_VISI_PUBLIC: rb_method_visibility_t = 1; |