Merge branch 'master' into v2.1

2014-10-08 22:06:23 +02:00
parent be64823d95 6d0654d3ec
commit d2809bec24
2 changed files with 10 additions and 1 deletions
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -359,6 +359,7 @@ static Reg ra_rematk(ASMState *as, IRRef ref)
 static int32_t ra_spill(ASMState *as, IRIns *ir)
 {
  int32_t slot = ir->s;
+  lua_assert(ir >= as->ir + REF_TRUE);
  if (!ra_hasspill(slot)) {
    if (irt_is64(ir->t)) {
      slot = as->evenspill;