From 6360f6e10675d4337bbe0c79a67b40d6aa631393 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Sat, 28 May 2016 00:35:07 +0200 Subject: [PATCH] Fix collateral damage from LJ_GC64 changes to asm_href(). --- src/lj_asm_x86.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index 26705e2c..f5230a44 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h @@ -1180,7 +1180,7 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge) lua_assert(irt_ispri(kt) && !irt_isnil(kt)); emit_u32(as, (irt_toitype(kt)<<15)|0x7fff); emit_rmro(as, XO_ARITHi, XOg_CMP, dest, offsetof(Node, key.it)); -#else +#endif } else { if (!irt_ispri(kt)) { lua_assert(irt_isaddr(kt)); @@ -1194,7 +1194,6 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge) lua_assert(!irt_isnil(kt)); emit_i8(as, irt_toitype(kt)); emit_rmro(as, XO_ARITHi8, XOg_CMP, dest, offsetof(Node, key.it)); -#endif } emit_sfixup(as, l_loop); checkmclim(as);