Merge branch 'master' into v2.1

Mike Pall · Mike Pall · commit 94d4abcca966 · 2020-08-09T23:12:48.000+02:00
diff --git a/src/lj_debug.c b/src/lj_debug.c
@@ -94,6 +94,7 @@ static BCPos debug_framepc(lua_State *L, GCfunc *fn, cTValue *nextframe)
 	}
       }
       ins = cframe_pc(cf);
+      if (!ins) return NO_BCPOS;
     }
   }
   pt = funcproto(fn);
diff --git a/src/lj_dispatch.h b/src/lj_dispatch.h
@@ -46,7 +46,7 @@ extern double __divdf3(double a, double b);
   _(asin) _(acos) _(atan) _(sinh) _(cosh) _(tanh) _(frexp) _(modf) _(atan2) \
   _(pow) _(fmod) _(ldexp) _(lj_vm_modi) \
   _(lj_dispatch_call) _(lj_dispatch_ins) _(lj_dispatch_stitch) \
-  _(lj_dispatch_profile) _(lj_err_throw) \
+  _(lj_dispatch_profile) _(lj_err_throw) _(lj_err_run) \
   _(lj_ffh_coroutine_wrap_err) _(lj_func_closeuv) _(lj_func_newL_gc) \
   _(lj_gc_barrieruv) _(lj_gc_step) _(lj_gc_step_fixtop) _(lj_meta_arith) \
   _(lj_meta_call) _(lj_meta_cat) _(lj_meta_comp) _(lj_meta_equal) \
diff --git 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) {
diff --git a/src/lj_err.h b/src/lj_err.h
@@ -23,7 +23,7 @@ LJ_DATA const char *lj_err_allmsg;
 LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em);
 LJ_FUNCA_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode);
 LJ_FUNC_NORET void lj_err_mem(lua_State *L);
-LJ_FUNC_NORET void lj_err_run(lua_State *L);
+LJ_FUNCA_NORET void LJ_FASTCALL lj_err_run(lua_State *L);
 LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em);
 LJ_FUNC_NORET void lj_err_lex(lua_State *L, GCstr *src, const char *tok,
 			      BCLine line, ErrMsg em, va_list argp);
diff --git a/src/lj_trace.c b/src/lj_trace.c
@@ -789,8 +789,8 @@ typedef struct ExitDataCP {
 static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud)
 {
   ExitDataCP *exd = (ExitDataCP *)ud;
-  cframe_errfunc(L->cframe) = -1;  /* Inherit error function. */
-  /* Always catch error here. */
+  /* Always catch error here and don't call error function. */
+  cframe_errfunc(L->cframe) = 0;
   cframe_nres(L->cframe) = -2*LUAI_MAXSTACK*(int)sizeof(TValue);
   exd->pc = lj_snap_restore(exd->J, exd->exptr);
   UNUSED(dummy);
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc
@@ -2245,9 +2245,8 @@ static void build_subroutines(BuildCtx *ctx)
   |  b <2
   |
   |9:  // Rethrow error from the right C frame.
-  |  rsb CARG2, CARG1, #0
   |  mov CARG1, L
-  |  bl extern lj_err_throw		// (lua_State *L, int errcode)
+  |  bl extern lj_err_run		// (lua_State *L)
   |.endif
   |
   |//-----------------------------------------------------------------------
diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc
@@ -2035,9 +2035,8 @@ static void build_subroutines(BuildCtx *ctx)
   |  b <2
   |
   |9:  // Rethrow error from the right C frame.
-  |  neg CARG2, CARG1
   |  mov CARG1, L
-  |  bl extern lj_err_throw		// (lua_State *L, int errcode)
+  |  bl extern lj_err_run		// (lua_State *L)
   |.endif
   |
   |//-----------------------------------------------------------------------
diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc
@@ -2520,9 +2520,8 @@ static void build_subroutines(BuildCtx *ctx)
   |.  addu 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
   |
diff --git 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
   |
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc
@@ -3090,9 +3090,8 @@ static void build_subroutines(BuildCtx *ctx)
   |  bctr
   |
   |9:  // Rethrow error from the right C frame.
-  |  neg CARG2, CARG1
   |  mr CARG1, L
-  |  bl extern lj_err_throw		// (lua_State *L, int errcode)
+  |  bl extern lj_err_run		// (lua_State *L)
   |.endif
   |
   |//-----------------------------------------------------------------------
diff --git a/src/vm_x64.dasc b/src/vm_x64.dasc
@@ -2509,10 +2509,8 @@ static void build_subroutines(BuildCtx *ctx)
   |  jmp <2
   |
   |9:  // Rethrow error from the right C frame.
-  |  neg RD
   |  mov CARG1, L:RB
-  |  mov CARG2, RD
-  |  call extern lj_err_throw		// (lua_State *L, int errcode)
+  |  call extern lj_err_run		// (lua_State *L)
   |.endif
   |
   |//-----------------------------------------------------------------------
diff --git 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
   |
   |//-----------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ static BCPos debug_framepc(lua_State L, GCfunc fn, cTValue *nextframe)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`ins = cframe_pc(cf);`
	`97`	`+ if (!ins) return NO_BCPOS;`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`pt = funcproto(fn);`
Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ static ptrdiff_t finderrfunc(lua_State *L)`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`/* Runtime error. */`
`601`		`-LJ_NOINLINE void lj_err_run(lua_State *L)`
	`601`	`+LJ_NOINLINE void LJ_FASTCALL lj_err_run(lua_State *L)`
`602`	`602`	`{`
`603`	`603`	`ptrdiff_t ef = finderrfunc(L);`
`604`	`604`	`if (ef) {`
Original file line number	Diff line number	Diff line change
`@@ -2245,9 +2245,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2245`	`2245`	`\| b <2`
`2246`	`2246`	`\|`
`2247`	`2247`	`\|9: // Rethrow error from the right C frame.`
`2248`		`- \| rsb CARG2, CARG1, #0`
`2249`	`2248`	`\| mov CARG1, L`
`2250`		`- \| bl extern lj_err_throw // (lua_State *L, int errcode)`
	`2249`	`+ \| bl extern lj_err_run // (lua_State *L)`
`2251`	`2250`	`\|.endif`
`2252`	`2251`	`\|`
`2253`	`2252`	`\|//-----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -2035,9 +2035,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2035`	`2035`	`\| b <2`
`2036`	`2036`	`\|`
`2037`	`2037`	`\|9: // Rethrow error from the right C frame.`
`2038`		`- \| neg CARG2, CARG1`
`2039`	`2038`	`\| mov CARG1, L`
`2040`		`- \| bl extern lj_err_throw // (lua_State *L, int errcode)`
	`2039`	`+ \| bl extern lj_err_run // (lua_State *L)`
`2041`	`2040`	`\|.endif`
`2042`	`2041`	`\|`
`2043`	`2042`	`\|//-----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -2520,9 +2520,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2520`	`2520`	`\|. addu RA, RA, BASE`
`2521`	`2521`	`\|`
`2522`	`2522`	`\|9: // Rethrow error from the right C frame.`
`2523`		`- \| load_got lj_err_throw`
`2524`		`- \| negu CARG2, CRET1`
`2525`		`- \| call_intern lj_err_throw // (lua_State *L, int errcode)`
	`2523`	`+ \| load_got lj_err_run`
	`2524`	`+ \| call_intern lj_err_run // (lua_State *L)`
`2526`	`2525`	`\|. move CARG1, L`
`2527`	`2526`	`\|.endif`
`2528`	`2527`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -2622,9 +2622,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2622`	`2622`	`\|. daddu RA, RA, BASE`
`2623`	`2623`	`\|`
`2624`	`2624`	`\|9: // Rethrow error from the right C frame.`
`2625`		`- \| load_got lj_err_throw`
`2626`		`- \| negu CARG2, CRET1`
`2627`		`- \| call_intern lj_err_throw // (lua_State *L, int errcode)`
	`2625`	`+ \| load_got lj_err_run`
	`2626`	`+ \| call_intern lj_err_run // (lua_State *L)`
`2628`	`2627`	`\|. move CARG1, L`
`2629`	`2628`	`\|.endif`
`2630`	`2629`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -3090,9 +3090,8 @@ static void build_subroutines(BuildCtx *ctx)`
`3090`	`3090`	`\| bctr`
`3091`	`3091`	`\|`
`3092`	`3092`	`\|9: // Rethrow error from the right C frame.`
`3093`		`- \| neg CARG2, CARG1`
`3094`	`3093`	`\| mr CARG1, L`
`3095`		`- \| bl extern lj_err_throw // (lua_State *L, int errcode)`
	`3094`	`+ \| bl extern lj_err_run // (lua_State *L)`
`3096`	`3095`	`\|.endif`
`3097`	`3096`	`\|`
`3098`	`3097`	`\|//-----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -2509,10 +2509,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2509`	`2509`	`\| jmp <2`
`2510`	`2510`	`\|`
`2511`	`2511`	`\|9: // Rethrow error from the right C frame.`
`2512`		`- \| neg RD`
`2513`	`2512`	`\| mov CARG1, L:RB`
`2514`		`- \| mov CARG2, RD`
`2515`		`- \| call extern lj_err_throw // (lua_State *L, int errcode)`
	`2513`	`+ \| call extern lj_err_run // (lua_State *L)`
`2516`	`2514`	`\|.endif`
`2517`	`2515`	`\|`
`2518`	`2516`	`\|//-----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -2960,10 +2960,8 @@ static void build_subroutines(BuildCtx *ctx)`
`2960`	`2960`	`\| jmp <2`
`2961`	`2961`	`\|`
`2962`	`2962`	`\|9: // Rethrow error from the right C frame.`
`2963`		`- \| neg RD`
`2964`	`2963`	`\| mov FCARG1, L:RB`
`2965`		`- \| mov FCARG2, RD`
`2966`		`- \| call extern lj_err_throw@8 // (lua_State *L, int errcode)`
	`2964`	`+ \| call extern lj_err_run@4 // (lua_State *L)`
`2967`	`2965`	`\|.endif`
`2968`	`2966`	`\|`
`2969`	`2967`	`\|//-----------------------------------------------------------------------`