Merge branch 'master' into v2.1

2019-12-08 19:50:36 +01:00
parent 05898a8824 de48d00094
commit 1d9a337de6
7 changed files with 16 additions and 13 deletions
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -502,7 +502,8 @@ LJLIB_CF(print)
    lua_gettable(L, LUA_GLOBALSINDEX);
    tv = L->top-1;
  }
-  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring);
+  shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring)
+              && !gcrefu(basemt_it(G(L), LJ_TNUMX));
  for (i = 0; i < nargs; i++) {
    cTValue *o = &L->base[i];
    const char *str;