From a52208737122d58e1d872559970b8aef3b145b59 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 31 May 2011 21:39:09 +0200
Subject: [PATCH] x86/x64: Minor cleanup in assembler backend.

---
 src/lj_asm_x86.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index dfc853dd..b7712b36 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -1416,7 +1416,7 @@ static void asm_cnew(ASMState *as, IRIns *ir)
     }
 #else
     int32_t ofs = sizeof(GCcdata);
-    if (LJ_HASFFI && sz == 8) {
+    if (sz == 8) {
       ofs += 4; ir++;
       lua_assert(ir->o == IR_HIOP);
     }
@@ -1428,11 +1428,11 @@ static void asm_cnew(ASMState *as, IRIns *ir)
 	emit_movtomro(as, r, RID_RET, ofs);
 	rset_clear(allow, r);
       }
-      if (!LJ_HASFFI || ofs == sizeof(GCcdata)) break;
+      if (ofs == sizeof(GCcdata)) break;
       ofs -= 4; ir--;
     } while (1);
 #endif
-    lua_assert(sz == 4 || (sz == 8 && (LJ_64 || LJ_HASFFI)));
+    lua_assert(sz == 4 || sz == 8);
   }
 
   /* Combine initialization of marked, gct and typeid. */