diff options
Diffstat (limited to 'vm_eval.c')
| -rw-r--r-- | vm_eval.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -16,7 +16,7 @@ struct local_var_list { }; static inline VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missing_reason call_status); -static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref); +static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref, int is_lambda); static inline VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv); static inline VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, VALUE block_handler); static VALUE vm_exec(rb_thread_t *th); @@ -1573,6 +1573,7 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv) struct rb_captured_block new_captured; const VALUE *ep = NULL; rb_cref_t *cref; + int is_lambda = FALSE; if (block_handler != VM_BLOCK_HANDLER_NONE) { again: @@ -1588,6 +1589,7 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv) new_block_handler = VM_BH_FROM_IFUNC_BLOCK(&new_captured); break; case block_handler_type_proc: + is_lambda = rb_proc_lambda_p(block_handler) != Qfalse; block_handler = vm_proc_to_block_handler(VM_BH_TO_PROC(block_handler)); goto again; case block_handler_type_symbol: @@ -1602,7 +1604,7 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv) } cref = vm_cref_push(th, under, ep, TRUE); - return vm_yield_with_cref(th, argc, argv, cref); + return vm_yield_with_cref(th, argc, argv, cref, is_lambda); } VALUE @@ -1623,7 +1625,7 @@ rb_yield_refine_block(VALUE refinement, VALUE refinements) CREF_REFINEMENTS_SET(cref, refinements); VM_FORCE_WRITE_SPECIAL_CONST(&VM_CF_LEP(th->cfp)[VM_ENV_DATA_INDEX_SPECVAL], new_block_handler); new_captured.self = refinement; - return vm_yield_with_cref(th, 0, NULL, cref); + return vm_yield_with_cref(th, 0, NULL, cref, FALSE); } } |