kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

use rb_iseq_check() for USE_LAZY_LOAD, too.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-02-16 09:15:26 +00:00
parent 3261cfd881
commit ccc388d806
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vm_core.h
View file

@ -1334,7 +1334,7 @@ static inline const rb_iseq_t *
vm_block_iseq(const struct rb_block *block) vm_block_iseq(const struct rb_block *block)
{ {
switch (vm_block_type(block)) { switch (vm_block_type(block)) {
case block_type_iseq: return block->as.captured.code.iseq; case block_type_iseq: return rb_iseq_check(block->as.captured.code.iseq);
case block_type_proc: return vm_proc_iseq(block->as.proc); case block_type_proc: return vm_proc_iseq(block->as.proc);
case block_type_ifunc: case block_type_ifunc:
case block_type_symbol: return NULL; case block_type_symbol: return NULL;

2
vm_insnhelper.c
View file

@ -2562,7 +2562,7 @@ vm_invoke_iseq_block(rb_thread_t *th, rb_control_frame_t *reg_cfp,
struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_calling_info *calling, const struct rb_call_info *ci,
int is_lambda, const struct rb_captured_block *captured) int is_lambda, const struct rb_captured_block *captured)
{ {
const rb_iseq_t *iseq = captured->code.iseq; const rb_iseq_t *iseq = rb_iseq_check(captured->code.iseq);
const int arg_size = iseq->body->param.size; const int arg_size = iseq->body->param.size;
VALUE * const rsp = GET_SP() - calling->argc; VALUE * const rsp = GET_SP() - calling->argc;
int opt_pc = vm_callee_setup_block_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_lambda : arg_setup_block); int opt_pc = vm_callee_setup_block_arg(th, calling, ci, iseq, rsp, is_lambda ? arg_setup_lambda : arg_setup_block);