From fb667912167e4ad813a2d0537306c38f266c110f Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Mon, 4 Nov 2013 20:27:44 -0500
Subject: [PATCH] do not create pic_env object when not needed

---
 src/codegen.c | 55 +++++++++++++++++++++++++++++++++++++++++----------
 src/vm.c      | 17 ++++++++++------
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/codegen.c b/src/codegen.c
index 8e14eeab..e1d41aec 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -571,6 +571,29 @@ valid_formal(pic_state *pic, pic_value formal)
   return false;
 }
 
+static void
+lift_cv(pic_state *pic, struct pic_irep *irep)
+{
+  int i;
+  struct pic_code c;
+
+  for (i = 0; i < irep->clen; ++i) {
+    c = irep->code[i];
+    switch (c.insn) {
+    default:
+      /* pass */
+      break;
+    case OP_LAMBDA:
+      lift_cv(pic, pic->irep[c.u.i]);
+      break;
+    case OP_CREF:
+    case OP_CSET:
+      irep->code[i].u.c.depth--;
+      break;
+    }
+  }
+}
+
 static void
 slide_cv(pic_state *pic, unsigned *cv_tbl, unsigned cv_num, struct pic_irep *irep, int d)
 {
@@ -584,7 +607,12 @@ slide_cv(pic_state *pic, unsigned *cv_tbl, unsigned cv_num, struct pic_irep *ire
       /* pass */
       break;
     case OP_LAMBDA:
-      slide_cv(pic, cv_tbl, cv_num, pic->irep[c.u.i], d + 1);
+      if (pic->irep[c.u.i]->cv_num == 0) {
+	slide_cv(pic, cv_tbl, cv_num, pic->irep[c.u.i], d);
+      }
+      else {
+	slide_cv(pic, cv_tbl, cv_num, pic->irep[c.u.i], d + 1);
+      }
       break;
     case OP_CREF:
     case OP_CSET:
@@ -672,16 +700,23 @@ codegen_lambda(codegen_state *state, pic_value obj)
       if (state->scope->dirty_flags[i])
 	++c;
     }
-    irep->cv_tbl = (unsigned *)pic_calloc(pic, c, sizeof(unsigned));
-    k = 0;
-    for (i = 0; i < irep->argc + irep->localc; ++i) {
-      if (state->scope->dirty_flags[i]) {
-	irep->cv_tbl[k] = i;
-	++k;
-      }
+    if (c == 0) {
+      lift_cv(pic, irep);
+      irep->cv_tbl = NULL;
+      irep->cv_num = 0;
+    }
+    else {
+      irep->cv_tbl = (unsigned *)pic_calloc(pic, c, sizeof(unsigned));
+      k = 0;
+      for (i = 0; i < irep->argc + irep->localc; ++i) {
+	if (state->scope->dirty_flags[i]) {
+	  irep->cv_tbl[k] = i;
+	  ++k;
+	}
+      }
+      irep->cv_num = c;
+      slide_cv(pic, irep->cv_tbl, irep->cv_num, irep, 0);
     }
-    irep->cv_num = c;
-    slide_cv(pic, irep->cv_tbl, irep->cv_num, irep, 0);
   }
   destroy_scope(pic, state->scope);
 
diff --git a/src/vm.c b/src/vm.c
index b7a9f81d..7fd5754a 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -368,12 +368,17 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
 	}
 
 	/* prepare env */
-	ci->env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV);
-	ci->env->up = proc->env;
-	ci->env->valuec = proc->u.irep->cv_num;
-	ci->env->values = (pic_value *)pic_calloc(pic, ci->env->valuec, sizeof(pic_value));
-	for (i = 0; i < ci->env->valuec; ++i) {
-	  ci->env->values[i] = ci->fp[proc->u.irep->cv_tbl[i]];
+	if (proc->u.irep->cv_num == 0) {
+	  ci->env = proc->env;
+	}
+	else {
+	  ci->env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV);
+	  ci->env->up = proc->env;
+	  ci->env->valuec = proc->u.irep->cv_num;
+	  ci->env->values = (pic_value *)pic_calloc(pic, ci->env->valuec, sizeof(pic_value));
+	  for (i = 0; i < ci->env->valuec; ++i) {
+	    ci->env->values[i] = ci->fp[proc->u.irep->cv_tbl[i]];
+	  }
 	}
 
 	pc = proc->u.irep->code;