Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2020-12-04 11:17:45 +01:00
commit 351bb43a07

View File

@ -1372,7 +1372,11 @@ static void build_subroutines(BuildCtx *ctx)
| mov LFUNC:RB, [RA-8] | mov LFUNC:RB, [RA-8]
| add NARGS:RD, 1 | add NARGS:RD, 1
| // This is fragile. L->base must not move, KBASE must always be defined. | // This is fragile. L->base must not move, KBASE must always be defined.
|.if x64
| cmp KBASEa, rdx // Continue with CALLT if flag set.
|.else
| cmp KBASE, BASE // Continue with CALLT if flag set. | cmp KBASE, BASE // Continue with CALLT if flag set.
|.endif
| je ->BC_CALLT_Z | je ->BC_CALLT_Z
| mov BASE, RA | mov BASE, RA
| ins_call // Otherwise call resolved metamethod. | ins_call // Otherwise call resolved metamethod.