FFI: Always fall back to metamethods for cdata length/concat.

Thanks to Egor Skriptunoff.

diff --git a/src/lib_ffi.c b/src/lib_ffi.c
index 5851eea5cdd9e7ca925699069bce3027f126480a..c7a26f565adee578e421f212222d5e2b854e02ce 100644 (file)
--- a/src/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -193,7 +193,7 @@ LJLIB_CF(ffi_meta___eq)             LJLIB_REC(cdata_arith MM_eq)
 
 LJLIB_CF(ffi_meta___len)       LJLIB_REC(cdata_arith MM_len)
 {
-  return lj_carith_len(L);
+  return ffi_arith(L);
 }
 
 LJLIB_CF(ffi_meta___lt)                LJLIB_REC(cdata_arith MM_lt)

diff --git a/src/lj_carith.c b/src/lj_carith.c
index b33b1f3614b30ae3deb768467aa4417573feb7d0..530d5ddb49ccd51aea2f7ab52f262a8c09a8f6f7 100644 (file)
--- a/src/lj_carith.c
+++ b/src/lj_carith.c
@@ -263,7 +263,7 @@ int lj_carith_op(lua_State *L, MMS mm)
 {
   CTState *cts = ctype_cts(L);
   CDArith ca;
-  if (carith_checkarg(L, cts, &ca)) {
+  if (carith_checkarg(L, cts, &ca) && mm != MM_len && mm != MM_concat) {
     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;
@@ -272,15 +272,6 @@ int lj_carith_op(lua_State *L, MMS mm)
   return lj_carith_meta(L, cts, &ca, mm);
 }
 
-/* No built-in functionality for length of cdata. */
-int lj_carith_len(lua_State *L)
-{
-  CTState *cts = ctype_cts(L);
-  CDArith ca;
-  carith_checkarg(L, cts, &ca);
-  return lj_carith_meta(L, cts, &ca, MM_len);
-}
-
 /* -- 64 bit integer arithmetic helpers ----------------------------------- */
 
 #if LJ_32 && LJ_HASJIT

diff --git a/src/lj_carith.h b/src/lj_carith.h
index bac3e1a4856fafdd96a9be159727e165b0768e52..207809df4fd962b698d646a0a25ac0d7510f0022 100644 (file)
--- a/src/lj_carith.h
+++ b/src/lj_carith.h
@@ -11,7 +11,6 @@
 #if LJ_HASFFI
 
 LJ_FUNC int lj_carith_op(lua_State *L, MMS mm);
-LJ_FUNC int lj_carith_len(lua_State *L);
 
 #if LJ_32 && LJ_HASJIT
 LJ_FUNC int64_t lj_carith_mul64(int64_t x, int64_t k);

diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index 99344b79ebf1ea049dd2ff1487fde77c234583ac..6e3c36a17320d86e12aeabb93d3990d46223575c 100644 (file)
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1443,8 +1443,10 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
   }
   {
     TRef tr;
-    if (!(tr = crec_arith_int64(J, sp, s, (MMS)rd->data)) &&
-       !(tr = crec_arith_ptr(J, sp, s, (MMS)rd->data)) &&
+    MMS mm = (MMS)rd->data;
+    if ((mm == MM_len || mm == MM_concat ||
+        (!(tr = crec_arith_int64(J, sp, s, mm)) &&
+         !(tr = crec_arith_ptr(J, sp, s, mm)))) &&
        !(tr = crec_arith_meta(J, sp, s, cts, rd)))
       return;
     J->base[0] = tr;