diff options
| author | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
| commit | 1d8b747c161db457e032a023ebbff511f5de5ec2 (patch) | |
| tree | 7254328c720b104f5d5b4bd8321cfcb18c6fb6ce /src/lib_base.c | |
| parent | 675e08cf069725a004284b4e1e67fbf0e8fcb4dd (diff) | |
| parent | 050466552bf7eb8b7944aa52c93b45326ae14d7a (diff) | |
| download | luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.gz luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.bz2 luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_base.c')
| -rw-r--r-- | src/lib_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib_base.c b/src/lib_base.c index eb604538..c8409042 100644 --- a/src/lib_base.c +++ b/src/lib_base.c | |||
| @@ -504,8 +504,8 @@ LJLIB_CF(print) | |||
| 504 | lua_gettable(L, LUA_GLOBALSINDEX); | 504 | lua_gettable(L, LUA_GLOBALSINDEX); |
| 505 | tv = L->top-1; | 505 | tv = L->top-1; |
| 506 | } | 506 | } |
| 507 | shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) | 507 | shortcut = (tvisfunc(tv) && funcV(tv)->c.ffid == FF_tostring) && |
| 508 | && !gcrefu(basemt_it(G(L), LJ_TNUMX)); | 508 | !gcrefu(basemt_it(G(L), LJ_TNUMX)); |
| 509 | for (i = 0; i < nargs; i++) { | 509 | for (i = 0; i < nargs; i++) { |
| 510 | cTValue *o = &L->base[i]; | 510 | cTValue *o = &L->base[i]; |
| 511 | const char *str; | 511 | const char *str; |