From: Mike Pall <mike>
Date: Mon, 2 Jul 2012 20:52:15 +0000 (+0200)
Subject: Handle initial snapshot for side traces in lj_snap.c only.
X-Git-Tag: v2.0.0-beta11~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afeb4e2c510ae70e0885d537cd4fb277a5d5de57;p=thirdparty%2FLuaJIT.git

Handle initial snapshot for side traces in lj_snap.c only.
---

diff --git a/src/lj_record.c b/src/lj_record.c
index 2ce8564c..be5c618f 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -2122,7 +2122,6 @@ void lj_record_setup(jit_State *J)
       J->startpc = NULL;  /* Prevent forming an extra loop. */
     }
     lj_snap_replay(J, T);
-    lj_snap_add(J);
   sidecheck:
     if (traceref(J, J->cur.root)->nchild >= J->param[JIT_P_maxside] ||
 	T->snap[J->exitno].count >= J->param[JIT_P_hotexit] +
diff --git a/src/lj_snap.c b/src/lj_snap.c
index 11d7ad0c..33edc8a6 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -413,6 +413,7 @@ void lj_snap_replay(jit_State *J, GCtrace *T)
   }
   J->base = J->slot + J->baseslot;
   J->maxslot = snap->nslots - J->baseslot;
+  lj_snap_add(J);
 }
 
 /* -- Snapshot restore ---------------------------------------------------- */