Merge branch 'master' into v2.1

2020-08-09 23:12:48 +02:00
parent 46a6d06dc5 e296f56b82
commit 94d4abcca9
12 changed files with 15 additions and 23 deletions
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -598,7 +598,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
 }

 /* Runtime error. */
-LJ_NOINLINE void lj_err_run(lua_State *L)
+LJ_NOINLINE void LJ_FASTCALL lj_err_run(lua_State *L)
 {
  ptrdiff_t ef = finderrfunc(L);
  if (ef) {