From 39eddd3b96e3a234973906a4b1979e4f64e87e1c Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 18 Jan 2016 12:02:01 +0100
Subject: [PATCH] Always merge snapshots without instructions inbetween.

Thanks to Vyacheslav Egorov.
---
 src/lj_snap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lj_snap.c b/src/lj_snap.c
index 62515ed0..368bad33 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -145,8 +145,8 @@ void lj_snap_add(jit_State *J)
   MSize nsnap = J->cur.nsnap;
   MSize nsnapmap = J->cur.nsnapmap;
   /* Merge if no ins. inbetween or if requested and no guard inbetween. */
-  if (J->mergesnap ? !irt_isguard(J->guardemit) :
-      (nsnap > 0 && J->cur.snap[nsnap-1].ref == J->cur.nins)) {
+  if ((nsnap > 0 && J->cur.snap[nsnap-1].ref == J->cur.nins) ||
+      (J->mergesnap && !irt_isguard(J->guardemit))) {
     if (nsnap == 1) {  /* But preserve snap #0 PC. */
       emitir_raw(IRT(IR_NOP, IRT_NIL), 0, 0);
       goto nomerge;