diff options
author | Mike Pall <mike> | 2024-08-24 17:14:51 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2024-08-24 17:14:51 +0200 |
commit | f725e44cda8f359869bf8f92ce71787ddca45618 (patch) | |
tree | adbdccbb6ae186343a010f41833616fdeae02ce3 /src | |
parent | c68711cc872e6626dc9e653e94df7bf21691d38e (diff) | |
parent | e45fd4cb713b610506213692f3b55a1869febb03 (diff) | |
download | luajit-f725e44cda8f359869bf8f92ce71787ddca45618.tar.gz luajit-f725e44cda8f359869bf8f92ce71787ddca45618.tar.bz2 luajit-f725e44cda8f359869bf8f92ce71787ddca45618.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r-- | src/lj_ffrecord.c | 2 | ||||
-rw-r--r-- | src/lj_opt_narrow.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c index b298d3f7..938c23b6 100644 --- a/src/lj_ffrecord.c +++ b/src/lj_ffrecord.c | |||
@@ -259,7 +259,7 @@ static void LJ_FASTCALL recff_setmetatable(jit_State *J, RecordFFData *rd) | |||
259 | mtref = tref_isnil(mt) ? lj_ir_knull(J, IRT_TAB) : mt; | 259 | mtref = tref_isnil(mt) ? lj_ir_knull(J, IRT_TAB) : mt; |
260 | emitir(IRT(IR_FSTORE, IRT_TAB), fref, mtref); | 260 | emitir(IRT(IR_FSTORE, IRT_TAB), fref, mtref); |
261 | if (!tref_isnil(mt)) | 261 | if (!tref_isnil(mt)) |
262 | emitir(IRT(IR_TBAR, IRT_TAB), tr, 0); | 262 | emitir(IRT(IR_TBAR, IRT_NIL), tr, 0); |
263 | J->base[0] = tr; | 263 | J->base[0] = tr; |
264 | J->needsnap = 1; | 264 | J->needsnap = 1; |
265 | } /* else: Interpreter will throw. */ | 265 | } /* else: Interpreter will throw. */ |
diff --git a/src/lj_opt_narrow.c b/src/lj_opt_narrow.c index 1172df2b..02fb9e68 100644 --- a/src/lj_opt_narrow.c +++ b/src/lj_opt_narrow.c | |||
@@ -341,7 +341,8 @@ static int narrow_conv_backprop(NarrowConv *nc, IRRef ref, int depth) | |||
341 | NarrowIns *savesp = nc->sp; | 341 | NarrowIns *savesp = nc->sp; |
342 | int count = narrow_conv_backprop(nc, ir->op1, depth); | 342 | int count = narrow_conv_backprop(nc, ir->op1, depth); |
343 | count += narrow_conv_backprop(nc, ir->op2, depth); | 343 | count += narrow_conv_backprop(nc, ir->op2, depth); |
344 | if (count <= 1) { /* Limit total number of conversions. */ | 344 | /* Limit total number of conversions. */ |
345 | if (count <= 1 && nc->sp < nc->maxsp) { | ||
345 | *nc->sp++ = NARROWINS(IRT(ir->o, nc->t), ref); | 346 | *nc->sp++ = NARROWINS(IRT(ir->o, nc->t), ref); |
346 | return count; | 347 | return count; |
347 | } | 348 | } |