diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-12 18:38:42 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-01-12 18:38:42 +0900 |
| commit | bec4d30dc6620c4102ce7acc08a4cb1c735a6ad5 (patch) | |
| tree | 9b7912d7b859c3cb2ee026a48582934c7af5cd2c /src/kernel.c | |
| parent | e13f34e30866add2ec1829ec1819366844701c34 (diff) | |
| parent | 9877f4ca3c10e21b9d525256fe8cebc4ea404727 (diff) | |
| download | mruby-bec4d30dc6620c4102ce7acc08a4cb1c735a6ad5.tar.gz mruby-bec4d30dc6620c4102ce7acc08a4cb1c735a6ad5.zip | |
Merge branch 'reorganize-ci' of https://github.com/dearblue/mruby into dearblue-reorganize-ci
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kernel.c b/src/kernel.c index b98e52c42..36ed0c121 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -176,8 +176,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) if (bidx < 0) return mrb_false_value(); bp = &e->stack[bidx]; } - else if (ci->env) { - e = ci->env; + else if ((e = mrb_vm_ci_env(ci)) != NULL) { /* top-level does not have block slot (always false) */ if (e->stack == mrb->c->stbase) return mrb_false_value(); bidx = env_bidx(e); @@ -186,7 +185,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) bp = &e->stack[bidx]; } else { - bp = ci[1].stackent+1; + bp = ci->stack+1; if (ci->argc >= 0) { bp += ci->argc; } |