1 files changed, 4 insertions, 2 deletions

diff --git a/src/lj_carith.c b/src/lj_carith.c
index 9f94091d..92fe5597 100644
--- a/src/lj_carith.c
+++ b/src/lj_carith.c
@@ -73,7 +73,7 @@ static int carith_checkarg(lua_State *L, CTState *cts, CDArith *ca)
           ok = 1;
         } else {
           ca->ct[1-i] = ct;  /* Use enum to improve error message. */
-          ca->p[1-i] = NULL;
+          ca->p[1-i] = (void *)(intptr_t)1;  /* To make it unequal. */
           break;
         }
       }
@@ -234,7 +234,9 @@ static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
     const char *repr[2];
     int i, isenum = -1, isstr = -1;
     if (mm == MM_eq) {  /* Equality checks never raise an error. */
-      setboolV(L->top-1, 0);
+      int eq = ca->p[0] == ca->p[1];
+      setboolV(L->top-1, eq);
+      setboolV(&G(L)->tmptv2, eq);  /* Remember for trace recorder. */
       return 1;
     }
     for (i = 0; i < 2; i++) {