From 80534b6d14f1392ab1c199f0906880d61f55ae84 Mon Sep 17 00:00:00 2001
From: take_cheeze <takechi101010@gmail.com>
Date: Tue, 1 Apr 2014 01:13:39 +0900
Subject: Use MRB_ENV_STACK_LEN instead of accessing `flags` directly to get
 REnv's stack length.

---
 src/gc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gc.c')

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]);
         }
-- 
cgit v1.2.3


From 755ded2ef087bc29c8223919a3e8ab95a0692de4 Mon Sep 17 00:00:00 2001
From: take_cheeze <takechi101010@gmail.com>
Date: Tue, 1 Apr 2014 01:53:28 +0900
Subject: Use MRB_ENV_STACK_SHARED_P to check `cioff` field of REnv.

---
 include/mruby/proc.h | 1 +
 src/gc.c             | 4 ++--
 src/vm.c             | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/gc.c')

diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index e72e8f7e4..870e9f748 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -22,6 +22,7 @@ struct REnv {
 
 #define MRB_ENV_STACK_LEN(e) ((e)->flags)
 #define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1)
+#define MRB_ENV_STACK_SHARED_P(e) ((e)->cioff >= 0)
 
 struct RProc {
   MRB_OBJECT_HEADER;
diff --git a/src/gc.c b/src/gc.c
index 426a84514..4db640ff4 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -515,7 +515,7 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
     {
       struct REnv *e = (struct REnv*)obj;
 
-      if (e->cioff < 0) {
+      if (!MRB_ENV_STACK_SHARED_P(e)) {
         int i, len;
 
         len = (int)MRB_ENV_STACK_LEN(e);
@@ -612,7 +612,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
     {
       struct REnv *e = (struct REnv*)obj;
 
-      if (e->cioff < 0) {
+      if (!MRB_ENV_STACK_SHARED_P(e)) {
         mrb_free(mrb, e->stack);
         e->stack = NULL;
       }
diff --git a/src/vm.c b/src/vm.c
index 4aa9b9460..09988a996 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -121,7 +121,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
   if (newbase == oldbase) return;
   while (ci <= mrb->c->ci) {
     struct REnv *e = ci->env;
-    if (e && e->cioff >= 0) {
+    if (e && MRB_ENV_STACK_SHARED_P(e)) {
       ptrdiff_t off = e->stack - oldbase;
 
       e->stack = newbase + off;
@@ -188,7 +188,7 @@ is_strict(mrb_state *mrb, struct REnv *e)
 {
   int cioff = e->cioff;
 
-  if (cioff >= 0 && mrb->c->cibase[cioff].proc &&
+  if (MRB_ENV_STACK_SHARED_P(e) && mrb->c->cibase[cioff].proc &&
       MRB_PROC_STRICT_P(mrb->c->cibase[cioff].proc)) {
     return TRUE;
   }
@@ -1406,7 +1406,7 @@ RETRY_TRY_BLOCK:
           if (proc->env && !MRB_PROC_STRICT_P(proc)) {
             struct REnv *e = top_env(mrb, proc);
 
-            if (e->cioff < 0) {
+            if (!MRB_ENV_STACK_SHARED_P(e)) {
               localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
               goto L_RAISE;
             }
@@ -1437,7 +1437,7 @@ RETRY_TRY_BLOCK:
           ci = mrb->c->ci;
           break;
         case OP_R_BREAK:
-          if (!proc->env || proc->env->cioff < 0) {
+          if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
             localjump_error(mrb, LOCALJUMP_ERROR_BREAK);
             goto L_RAISE;
           }
-- 
cgit v1.2.3