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_x86.dasc
+++ b/src/vm_x86.dasc
@@ -2960,10 +2960,8 @@ static void build_subroutines(BuildCtx *ctx)
  |  jmp <2
  |
  |9:  // Rethrow error from the right C frame.
-  |  neg RD
  |  mov FCARG1, L:RB
-  |  mov FCARG2, RD
-  |  call extern lj_err_throw@8		// (lua_State *L, int errcode)
+  |  call extern lj_err_run@4		// (lua_State *L)
  |.endif
  |
  |//-----------------------------------------------------------------------