diff options
Diffstat (limited to 'vm_core.h')
| -rw-r--r-- | vm_core.h | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -183,8 +183,7 @@ typedef struct rb_call_info_struct { VALUE klass; /* inline cache: values */ - const rb_method_entry_t *me; - VALUE defined_class; + const rb_callable_method_entry_t *me; /* temporary values for method calling */ struct rb_block_struct *blockptr; @@ -524,7 +523,7 @@ typedef struct rb_vm_struct { #endif #ifndef VM_DEBUG_VERIFY_METHOD_CACHE -#define VM_DEBUG_VERIFY_METHOD_CACHE 0 +#define VM_DEBUG_VERIFY_METHOD_CACHE (VM_DEBUG_MODE != 0) #endif typedef struct rb_control_frame_struct { @@ -533,10 +532,9 @@ typedef struct rb_control_frame_struct { rb_iseq_t *iseq; /* cfp[2] */ VALUE flag; /* cfp[3] */ VALUE self; /* cfp[4] / block[0] */ - VALUE klass; /* cfp[5] / block[1] */ - VALUE *ep; /* cfp[6] / block[2] */ - rb_iseq_t *block_iseq; /* cfp[7] / block[3] */ - VALUE proc; /* cfp[8] / block[4] */ + VALUE *ep; /* cfp[6] / block[1] */ + rb_iseq_t *block_iseq; /* cfp[7] / block[2] */ + VALUE proc; /* cfp[8] / block[3] */ #if VM_DEBUG_BP_CHECK VALUE *bp_check; /* cfp[9] */ @@ -545,7 +543,6 @@ typedef struct rb_control_frame_struct { typedef struct rb_block_struct { VALUE self; /* share with method frame if it's only block */ - VALUE klass; /* share with method frame if it's only block */ VALUE *ep; /* share with method frame if it's only block */ rb_iseq_t *iseq; VALUE proc; @@ -631,7 +628,7 @@ typedef struct rb_thread_struct { const rb_block_t *passed_block; /* for bmethod */ - const rb_method_entry_t *passed_bmethod_me; + const rb_callable_method_entry_t *passed_bmethod_me; /* for cfunc */ rb_call_info_t *passed_ci; @@ -976,8 +973,7 @@ VALUE *rb_binding_add_dynavars(rb_binding_t *bind, int dyncount, const ID *dynva void rb_vm_inc_const_missing_count(void); void rb_vm_gvl_destroy(rb_vm_t *vm); VALUE rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc, - const VALUE *argv, const rb_method_entry_t *me, - VALUE defined_class); + const VALUE *argv, const rb_callable_method_entry_t *me); void rb_thread_start_timer_thread(void); void rb_thread_stop_timer_thread(int); @@ -1024,7 +1020,7 @@ int rb_autoloading_value(VALUE mod, ID id, VALUE* value); void rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr); -const rb_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp); +const rb_callable_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp); #define sysstack_error GET_VM()->special_exceptions[ruby_error_sysstack] |