diff options
| author | Mike Pall <mike> | 2020-10-12 15:43:18 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-10-12 15:43:18 +0200 |
| commit | 4bb2e4a547330c59adadf206451944921219c6ed (patch) | |
| tree | 780230382deae1647c0ff3f0e324b43fccf93196 /src/lj_asm.c | |
| parent | e9af1abec542e6f9851ff2368e7f196b6382a44c (diff) | |
| parent | de6b1a11dd1a3349179084578c5d533be1c30234 (diff) | |
| download | luajit-4bb2e4a547330c59adadf206451944921219c6ed.tar.gz luajit-4bb2e4a547330c59adadf206451944921219c6ed.tar.bz2 luajit-4bb2e4a547330c59adadf206451944921219c6ed.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm.c')
| -rw-r--r-- | src/lj_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c index cc7841c0..aae7b5b9 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c | |||
| @@ -2342,7 +2342,7 @@ void lj_asm_trace(jit_State *J, GCtrace *T) | |||
| 2342 | /* Ensure an initialized instruction beyond the last one for HIOP checks. */ | 2342 | /* Ensure an initialized instruction beyond the last one for HIOP checks. */ |
| 2343 | /* This also allows one RENAME to be added without reallocating curfinal. */ | 2343 | /* This also allows one RENAME to be added without reallocating curfinal. */ |
| 2344 | as->orignins = lj_ir_nextins(J); | 2344 | as->orignins = lj_ir_nextins(J); |
| 2345 | J->cur.ir[as->orignins].o = IR_NOP; | 2345 | lj_ir_nop(&J->cur.ir[as->orignins]); |
| 2346 | 2346 | ||
| 2347 | /* Setup initial state. Copy some fields to reduce indirections. */ | 2347 | /* Setup initial state. Copy some fields to reduce indirections. */ |
| 2348 | as->J = J; | 2348 | as->J = J; |