1 files changed, 18 insertions, 4 deletions

diff --git a/src/lj_meta.c b/src/lj_meta.c
index 441d571a..db1ce928 100644
--- a/src/lj_meta.c
+++ b/src/lj_meta.c
@@ -12,6 +12,7 @@
 #include "lj_obj.h"
 #include "lj_gc.h"
 #include "lj_err.h"
+#include "lj_buf.h"
 #include "lj_str.h"
 #include "lj_tab.h"
 #include "lj_meta.h"
@@ -19,6 +20,7 @@
 #include "lj_bc.h"
 #include "lj_vm.h"
 #include "lj_strscan.h"
+#include "lj_lib.h"
 
 /* -- Metamethod handling ------------------------------------------------- */
 
@@ -282,7 +284,7 @@ TValue *lj_meta_cat(lua_State *L, TValue *top, int left)
       ** next step: [...][CAT stack ............]
       */
       MSize tlen = strV(top)->len;
-      char *buffer;
+      char *buf;
       int i;
       for (n = 1; n <= left && tostring(L, top-n); n++) {
         MSize len = strV(top-n)->len;
@@ -290,15 +292,15 @@ TValue *lj_meta_cat(lua_State *L, TValue *top, int left)
           lj_err_msg(L, LJ_ERR_STROV);
         tlen += len;
       }
-      buffer = lj_str_needbuf(L, &G(L)->tmpbuf, tlen);
+      buf = lj_buf_tmp(L, tlen);
       n--;
       tlen = 0;
       for (i = n; i >= 0; i--) {
         MSize len = strV(top-i)->len;
-        memcpy(buffer + tlen, strVdata(top-i), len);
+        memcpy(buf + tlen, strVdata(top-i), len);
         tlen += len;
       }
-      setstrV(L, top-n, lj_str_new(L, buffer, tlen));
+      setstrV(L, top-n, lj_str_new(L, buf, tlen));
     }
     left -= n;
     top -= n;
@@ -423,6 +425,18 @@ TValue *lj_meta_comp(lua_State *L, cTValue *o1, cTValue *o2, int op)
   }
 }
 
+/* Helper for ISTYPE and ISNUM. Implicit coercion or error. */
+void lj_meta_istype(lua_State *L, BCReg ra, BCReg tp)
+{
+  L->top = curr_topL(L);
+  ra++; tp--;
+  lua_assert(LJ_DUALNUM || tp != ~LJ_TNUMX);  /* ISTYPE -> ISNUM broken. */
+  if (LJ_DUALNUM && tp == ~LJ_TNUMX) lj_lib_checkint(L, ra);
+  else if (tp == ~LJ_TNUMX+1) lj_lib_checknum(L, ra);
+  else if (tp == ~LJ_TSTR) lj_lib_checkstr(L, ra);
+  else lj_err_argtype(L, ra, lj_obj_itypename[tp]);
+}
+
 /* Helper for calls. __call metamethod. */
 void lj_meta_call(lua_State *L, TValue *func, TValue *top)
 {