From: Mike Pall <mike>
Date: Mon, 7 Apr 2025 08:33:15 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a7ea8a924d8137e6950b97c3e36f17264f6c79;p=thirdparty%2FLuaJIT.git

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

e0a7ea8a924d8137e6950b97c3e36f17264f6c79
diff --cc src/lj_record.c
index c6a082d4,d336f642..ad45bebb
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@@ -1107,9 -854,11 +1107,12 @@@ int lj_record_mm_lookup(jit_State *J, R
        return 0;  /* No metamethod. */
      }
      /* The cdata metatable is treated as immutable. */
-     if (LJ_HASFFI && tref_iscdata(ix->tab)) goto immutable_mt;
+     if (LJ_HASFFI && tref_iscdata(ix->tab)) {
+       mix.tab = TREF_NIL;
+       goto immutable_mt;
+     }
 -    ix->mt = mix.tab = lj_ir_ktab(J, mt);
 +    ix->mt = mix.tab = lj_ir_ggfload(J, IRT_TAB,
 +      GG_OFS(g.gcroot[GCROOT_BASEMT+itypemap(&ix->tabv)]));
      goto nocheck;
    }
    ix->mt = mt ? mix.tab : TREF_NIL;