From: Mike Pall <mike>
Date: Sat, 25 May 2024 14:41:53 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

f5587f5eb3a2fcab18afd6b2e073cdb0b56b7d8a
diff --cc src/lj_snap.c
index f3645e87,9858c110..6fda08ba
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@@ -815,11 -744,12 +814,14 @@@ static void snap_restoredata(jit_State 
  #endif
        } else
  #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++;
+       }
      }
    }
 -  lua_assert(sz == 1 || sz == 2 || sz == 4 || sz == 8);
 +  lj_assertJ(sz == 1 || sz == 2 || sz == 4 || sz == 8,
 +	     "restore from IR %04d with bad size %d", ref - REF_BIAS, sz);
    if (sz == 4) *(int32_t *)dst = *src;
    else if (sz == 8) *(int64_t *)dst = *(int64_t *)src;
    else if (sz == 1) *(int8_t *)dst = (int8_t)*src;