Merge branch 'master' into v2.1

2013-05-16 20:07:53 +02:00
parent a946f678d5 0f79d4741f
commit 647cc4613f
5 changed files with 9 additions and 9 deletions
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -1198,7 +1198,7 @@ static void asm_collectargs(ASMState *as, IRIns *ir,
 			    const CCallInfo *ci, IRRef *args)
 {
  uint32_t n = CCI_XNARGS(ci);
-  lua_assert(n <= CCI_NARGS_MAX);
+  lua_assert(n <= CCI_NARGS_MAX*2);  /* Account for split args. */
  if ((ci->flags & CCI_L)) { *args++ = ASMREF_L; n--; }
  while (n-- > 1) {
    ir = IR(ir->op1);