From df1b007fbd64363067539ff7e89aff6368d605ab Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sat, 1 Apr 2023 10:21:52 -0700 Subject: Remove unused VM_CALL_BLOCKISEQ flag --- iseq.c | 1 - vm_callinfo.h | 2 -- yjit/src/cruby_bindings.inc.rs | 17 ++++++++--------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/iseq.c b/iseq.c index 1e9a3f7497..ccb6c152e5 100644 --- a/iseq.c +++ b/iseq.c @@ -2104,7 +2104,6 @@ rb_insn_operand_intern(const rb_iseq_t *iseq, CALL_FLAG(FCALL); CALL_FLAG(VCALL); CALL_FLAG(ARGS_SIMPLE); - CALL_FLAG(BLOCKISEQ); CALL_FLAG(TAILCALL); CALL_FLAG(SUPER); CALL_FLAG(ZSUPER); diff --git a/vm_callinfo.h b/vm_callinfo.h index 1c61a839d3..ccdf720cfc 100644 --- a/vm_callinfo.h +++ b/vm_callinfo.h @@ -18,7 +18,6 @@ enum vm_call_flag_bits { VM_CALL_FCALL_bit, // m(args) # receiver is self VM_CALL_VCALL_bit, // m # method call that looks like a local variable VM_CALL_ARGS_SIMPLE_bit, // (ci->flag & (SPLAT|BLOCKARG)) && blockiseq == NULL && ci->kw_arg == NULL - VM_CALL_BLOCKISEQ_bit, // has blockiseq VM_CALL_KWARG_bit, // has kwarg VM_CALL_KW_SPLAT_bit, // m(**opts) VM_CALL_TAILCALL_bit, // located at tail position @@ -34,7 +33,6 @@ enum vm_call_flag_bits { #define VM_CALL_FCALL (0x01 << VM_CALL_FCALL_bit) #define VM_CALL_VCALL (0x01 << VM_CALL_VCALL_bit) #define VM_CALL_ARGS_SIMPLE (0x01 << VM_CALL_ARGS_SIMPLE_bit) -#define VM_CALL_BLOCKISEQ (0x01 << VM_CALL_BLOCKISEQ_bit) #define VM_CALL_KWARG (0x01 << VM_CALL_KWARG_bit) #define VM_CALL_KW_SPLAT (0x01 << VM_CALL_KW_SPLAT_bit) #define VM_CALL_TAILCALL (0x01 << VM_CALL_TAILCALL_bit) diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index c970b5d244..83077f8f1b 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -810,15 +810,14 @@ pub const VM_CALL_ARGS_BLOCKARG_bit: vm_call_flag_bits = 1; pub const VM_CALL_FCALL_bit: vm_call_flag_bits = 2; pub const VM_CALL_VCALL_bit: vm_call_flag_bits = 3; pub const VM_CALL_ARGS_SIMPLE_bit: vm_call_flag_bits = 4; -pub const VM_CALL_BLOCKISEQ_bit: vm_call_flag_bits = 5; -pub const VM_CALL_KWARG_bit: vm_call_flag_bits = 6; -pub const VM_CALL_KW_SPLAT_bit: vm_call_flag_bits = 7; -pub const VM_CALL_TAILCALL_bit: vm_call_flag_bits = 8; -pub const VM_CALL_SUPER_bit: vm_call_flag_bits = 9; -pub const VM_CALL_ZSUPER_bit: vm_call_flag_bits = 10; -pub const VM_CALL_OPT_SEND_bit: vm_call_flag_bits = 11; -pub const VM_CALL_KW_SPLAT_MUT_bit: vm_call_flag_bits = 12; -pub const VM_CALL__END: vm_call_flag_bits = 13; +pub const VM_CALL_KWARG_bit: vm_call_flag_bits = 5; +pub const VM_CALL_KW_SPLAT_bit: vm_call_flag_bits = 6; +pub const VM_CALL_TAILCALL_bit: vm_call_flag_bits = 7; +pub const VM_CALL_SUPER_bit: vm_call_flag_bits = 8; +pub const VM_CALL_ZSUPER_bit: vm_call_flag_bits = 9; +pub const VM_CALL_OPT_SEND_bit: vm_call_flag_bits = 10; +pub const VM_CALL_KW_SPLAT_MUT_bit: vm_call_flag_bits = 11; +pub const VM_CALL__END: vm_call_flag_bits = 12; pub type vm_call_flag_bits = u32; #[repr(C)] pub struct rb_callinfo { -- cgit v1.2.3