diff options
| author | Mike Pall <mike> | 2013-05-16 20:07:53 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-16 20:07:53 +0200 |
| commit | 647cc4613f3acd5ec8785920102af22b85cf2b9c (patch) | |
| tree | e73f6e3ef1201884eb4be43097c51e1df80d9a7f /src/lj_asm.c | |
| parent | a946f678d553494ee23a29a10cced1d5cc11ab7e (diff) | |
| parent | 0f79d4741f29637de1eaaa603fdd0d161feb390d (diff) | |
| download | luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.tar.gz luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.tar.bz2 luajit-647cc4613f3acd5ec8785920102af22b85cf2b9c.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm.c')
| -rw-r--r-- | src/lj_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c index a1e92003..7542c77c 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c | |||
| @@ -1198,7 +1198,7 @@ static void asm_collectargs(ASMState *as, IRIns *ir, | |||
| 1198 | const CCallInfo *ci, IRRef *args) | 1198 | const CCallInfo *ci, IRRef *args) |
| 1199 | { | 1199 | { |
| 1200 | uint32_t n = CCI_XNARGS(ci); | 1200 | uint32_t n = CCI_XNARGS(ci); |
| 1201 | lua_assert(n <= CCI_NARGS_MAX); | 1201 | lua_assert(n <= CCI_NARGS_MAX*2); /* Account for split args. */ |
| 1202 | if ((ci->flags & CCI_L)) { *args++ = ASMREF_L; n--; } | 1202 | if ((ci->flags & CCI_L)) { *args++ = ASMREF_L; n--; } |
| 1203 | while (n-- > 1) { | 1203 | while (n-- > 1) { |
| 1204 | ir = IR(ir->op1); | 1204 | ir = IR(ir->op1); |