Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2024-05-25 16:41:53 +02:00
commit f5587f5eb3

View File

@ -801,7 +801,6 @@ static void snap_restoredata(jit_State *J, GCtrace *T, ExitState *ex,
*(lua_Number *)dst = (lua_Number)*(int32_t *)dst; *(lua_Number *)dst = (lua_Number)*(int32_t *)dst;
return; return;
} }
src = (int32_t *)&ex->gpr[r-RID_MIN_GPR];
#if !LJ_SOFTFP #if !LJ_SOFTFP
if (r >= RID_MAX_GPR) { if (r >= RID_MAX_GPR) {
src = (int32_t *)&ex->fpr[r-RID_MIN_FPR]; src = (int32_t *)&ex->fpr[r-RID_MIN_FPR];
@ -815,7 +814,10 @@ static void snap_restoredata(jit_State *J, GCtrace *T, ExitState *ex,
#endif #endif
} else } else
#endif #endif
if (LJ_64 && LJ_BE && sz == 4) src++; {
src = (int32_t *)&ex->gpr[r-RID_MIN_GPR];
if (LJ_64 && LJ_BE && sz == 4) src++;
}
} }
} }
lj_assertJ(sz == 1 || sz == 2 || sz == 4 || sz == 8, lj_assertJ(sz == 1 || sz == 2 || sz == 4 || sz == 8,