admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5973 from dearblue/envadjust

Browse Source 
Small improvements to `envadjust()`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-04-06 10:48:49 +09:00
committed by GitHub
parent 9e4b3af553 17abe548a7
commit ce86040a0f
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+7 -10
View File
@@ -121,31 +121,28 @@ static inline void
envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase, size_t oldsize)
{
mrb_callinfo *ci = mrb->c->cibase;
ptrdiff_t delta = newbase - oldbase;
if (newbase == oldbase) return;
if (delta == 0) return;
while (ci <= mrb->c->ci) {
struct REnv *e = mrb_vm_ci_env(ci);
mrb_value *st;
if (e && MRB_ENV_ONSTACK_P(e) &&
(st = e->stack) && oldbase <= st && st < oldbase+oldsize) {
ptrdiff_t off = e->stack - oldbase;
e->stack = newbase + off;
(st = e->stack) && (size_t)(st - oldbase) < oldsize) {
e->stack += delta;
}
if (ci->proc && MRB_PROC_ENV_P(ci->proc) && e != MRB_PROC_ENV(ci->proc)) {
e = MRB_PROC_ENV(ci->proc);
if (e && MRB_ENV_ONSTACK_P(e) &&
(st = e->stack) && oldbase <= st && st < oldbase+oldsize) {
ptrdiff_t off = e->stack - oldbase;
e->stack = newbase + off;
(st = e->stack) && (size_t)(st - oldbase) < oldsize) {
e->stack += delta;
}
}
ci->stack = newbase + (ci->stack - oldbase);
ci->stack += delta;
ci++;
}
}