Use MRB_ENV_STACK_LEN instead of accessing `flags` directly to get REnv's stack length.

5 files changed, 8 insertions, 6 deletions

diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index bb924447e..6d2cf516a 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -20,6 +20,8 @@ struct REnv {
   int cioff;
 };
 
+#define MRB_ENV_STACK_LEN(e) ((e)->flags)
+
 struct RProc {
   MRB_OBJECT_HEADER;
   union {
diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c
index 507f91d7d..b4744fa1b 100644
--- a/mrbgems/mruby-proc-ext/src/proc.c
+++ b/mrbgems/mruby-proc-ext/src/proc.c
@@ -18,7 +18,7 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mr
   mrb_gc_arena_restore(mrb, ai);
 
   e->cioff = -1;
-  e->flags = argc;
+  MRB_ENV_STACK_LEN(e) = argc;
   e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc);
   for (i = 0; i < argc; ++i) {
     e->stack[i] = argv[i];
@@ -39,9 +39,9 @@ mrb_cfunc_env_get(mrb_state *mrb, mrb_int idx)
   if (!e) {
     mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv.");
   }
-  if (idx < 0 || e->flags <= idx) {
+  if (idx < 0 || MRB_ENV_STACK_LEN(e) <= idx) {
     mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %S (expected: 0 <= index < %S)",
-               mrb_fixnum_value(idx), mrb_fixnum_value(e->flags));
+               mrb_fixnum_value(idx), mrb_fixnum_value(MRB_ENV_STACK_LEN(e)));
   }
 
   return e->stack[idx];
diff --git a/src/gc.c b/src/gc.c
index 81b234d6f..426a84514 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -518,7 +518,7 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
       if (e->cioff < 0) {
         int i, len;
 
-        len = (int)e->flags;
+        len = (int)MRB_ENV_STACK_LEN(e);
         for (i=0; i<len; i++) {
           mrb_gc_mark_value(mrb, e->stack[i]);
         }
diff --git a/src/proc.c b/src/proc.c
index 4e6e2b95f..0dfc3f818 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -41,7 +41,7 @@ closure_setup(mrb_state *mrb, struct RProc *p, int nlocals)
 
   if (!mrb->c->ci->env) {
     e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass*)mrb->c->ci->proc->env);
-    e->flags= (unsigned int)nlocals;
+    MRB_ENV_STACK_LEN(e)= (unsigned int)nlocals;
     e->mid = mrb->c->ci->mid;
     e->cioff = mrb->c->ci - mrb->c->cibase;
     e->stack = mrb->c->stack;
diff --git a/src/vm.c b/src/vm.c
index ad26d9b8c..e2b02a4ce 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -245,7 +245,7 @@ cipop(mrb_state *mrb)
 
   if (c->ci->env) {
     struct REnv *e = c->ci->env;
-    size_t len = (size_t)e->flags;
+    size_t len = (size_t)MRB_ENV_STACK_LEN(e);
     mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len);
 
     e->cioff = -1;