From eec17b718ae04b9bcff215114a156dcb25eb1458 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 8 Sep 2015 08:21:07 +0000 Subject: * vm_core.h: remove rb_call_info_t::blockiseq. * insns.def (send, invokesuper): pass blockiseq explicitly. * compile.c: catch up this fix. * iseq.c: ditto. * vm_args.c: ditto. * iseq.c (ISEQ_MINOR_VERSION): 2->3 because instruction spec was changed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 2a427534a8..bdfaf3a900 100644 --- a/vm_core.h +++ b/vm_core.h @@ -194,10 +194,8 @@ enum method_missing_reason { typedef struct rb_call_info_struct { /* fixed at compile time */ ID mid; - unsigned int flag; int orig_argc; - const rb_iseq_t *blockiseq; const rb_call_info_kw_arg_t *kw_arg; /* inline cache: keys */ @@ -839,7 +837,7 @@ enum vm_check_match_type { #define VM_CALL_TAILCALL (0x01 << 5) /* located at tail position */ #define VM_CALL_SUPER (0x01 << 6) /* super */ #define VM_CALL_OPT_SEND (0x01 << 7) /* internal flag */ -#define VM_CALL_ARGS_SIMPLE (0x01 << 8) /* (ci->flag & (SPLAT|BLOCKARG)) && ci->blockiseq == NULL && ci->kw_arg == NULL */ +#define VM_CALL_ARGS_SIMPLE (0x01 << 8) /* (ci->flag & (SPLAT|BLOCKARG)) && blockiseq == NULL && ci->kw_arg == NULL */ enum vm_special_object_type { VM_SPECIAL_OBJECT_VMCORE = 1, -- cgit v1.2.3