1 files changed, 27 insertions, 15 deletions

diff --git a/src/lj_carith.c b/src/lj_carith.c
index a59665d8..8f644d83 100644
--- a/src/lj_carith.c
+++ b/src/lj_carith.c
@@ -9,6 +9,8 @@
 
 #include "lj_gc.h"
 #include "lj_err.h"
+#include "lj_tab.h"
+#include "lj_meta.h"
 #include "lj_ctype.h"
 #include "lj_cconv.h"
 #include "lj_cdata.h"
@@ -187,24 +189,20 @@ static int carith_int64(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
   return 0;
 }
 
-/* Arithmetic operators for cdata. */
-int lj_carith_op(lua_State *L, MMS mm)
+/* Handle ctype arithmetic metamethods. */
+static int lj_carith_meta(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
 {
-  CTState *cts = ctype_cts(L);
-  CDArith ca;
-  if (carith_checkarg(L, cts, &ca)) {
-    if (carith_int64(L, cts, &ca, mm) || carith_ptr(L, cts, &ca, mm)) {
-      copyTV(L, &G(L)->tmptv2, L->top-1);  /* Remember for trace recorder. */
-      return 1;
-    }
-  }
-  /* NYI: per-cdata metamethods. */
-  {
+  cTValue *tv = NULL;
+  if (tviscdata(L->base))
+    tv = lj_ctype_meta(cts, cdataV(L->base)->typeid, mm);
+  if (!tv && L->base+1 < L->top && tviscdata(L->base+1))
+    tv = lj_ctype_meta(cts, cdataV(L->base+1)->typeid, mm);
+  if (!tv) {
     const char *repr[2];
     int i;
     for (i = 0; i < 2; i++) {
-      if (ca.ct[i])
-        repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca.ct[i]), NULL));
+      if (ca->ct[i])
+        repr[i] = strdata(lj_ctype_repr(L, ctype_typeid(cts, ca->ct[i]), NULL));
       else
         repr[i] = typename(&L->base[i]);
     }
@@ -213,7 +211,21 @@ int lj_carith_op(lua_State *L, MMS mm)
                       mm < MM_add ? LJ_ERR_FFI_BADCOMP : LJ_ERR_FFI_BADARITH,
                    repr[0], repr[1]);
   }
-  return 0;  /* unreachable */
+  return lj_meta_tailcall(L, tv);
+}
+
+/* Arithmetic operators for cdata. */
+int lj_carith_op(lua_State *L, MMS mm)
+{
+  CTState *cts = ctype_cts(L);
+  CDArith ca;
+  if (carith_checkarg(L, cts, &ca)) {
+    if (carith_int64(L, cts, &ca, mm) || carith_ptr(L, cts, &ca, mm)) {
+      copyTV(L, &G(L)->tmptv2, L->top-1);  /* Remember for trace recorder. */
+      return 1;
+    }
+  }
+  return lj_carith_meta(L, cts, &ca, mm);
 }
 
 /* -- 64 bit integer arithmetic helpers ----------------------------------- */