diff options
| author | Mike Pall <mike> | 2014-10-08 22:06:23 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-10-08 22:06:23 +0200 |
| commit | d2809bec24a7c6a6ec38d3e658c34131adc0de5a (patch) | |
| tree | 3858712eb3498c932fada98f116c9714e984e066 /src/lj_asm.c | |
| parent | be64823d957bea318e374d7a16a3985158b76cbb (diff) | |
| parent | 6d0654d3eca7654c9c4f8a9923907d06b177a8a1 (diff) | |
| download | luajit-d2809bec24a7c6a6ec38d3e658c34131adc0de5a.tar.gz luajit-d2809bec24a7c6a6ec38d3e658c34131adc0de5a.tar.bz2 luajit-d2809bec24a7c6a6ec38d3e658c34131adc0de5a.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm.c')
| -rw-r--r-- | src/lj_asm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c index 329e5c95..71d9a881 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c | |||
| @@ -359,6 +359,7 @@ static Reg ra_rematk(ASMState *as, IRRef ref) | |||
| 359 | static int32_t ra_spill(ASMState *as, IRIns *ir) | 359 | static int32_t ra_spill(ASMState *as, IRIns *ir) |
| 360 | { | 360 | { |
| 361 | int32_t slot = ir->s; | 361 | int32_t slot = ir->s; |
| 362 | lua_assert(ir >= as->ir + REF_TRUE); | ||
| 362 | if (!ra_hasspill(slot)) { | 363 | if (!ra_hasspill(slot)) { |
| 363 | if (irt_is64(ir->t)) { | 364 | if (irt_is64(ir->t)) { |
| 364 | slot = as->evenspill; | 365 | slot = as->evenspill; |