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/vm_mips64.dasc
+++ b/src/vm_mips64.dasc
@@ -2622,9 +2622,8 @@ static void build_subroutines(BuildCtx *ctx)
  |.  daddu RA, RA, BASE
  |
  |9:  // Rethrow error from the right C frame.
-  |  load_got lj_err_throw
-  |  negu CARG2, CRET1
-  |  call_intern lj_err_throw		// (lua_State *L, int errcode)
+  |  load_got lj_err_run
+  |  call_intern lj_err_run		// (lua_State *L)
  |.  move CARG1, L
  |.endif
  |