浏览代码

Merge branch 'master' into v2.1

Mike Pall 6 年之前
父节点
当前提交
827916c67e
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      src/lj_opt_mem.c

+ 2 - 1
src/lj_opt_mem.c

@@ -180,7 +180,8 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
 	}
 	ref = store->prev;
       }
-      lua_assert(ir->o != IR_TNEW || irt_isnil(fins->t));
+      if (ir->o == IR_TNEW && !irt_isnil(fins->t))
+	return 0;  /* Type instability in loop-carried dependency. */
       if (irt_ispri(fins->t)) {
 	return TREF_PRI(irt_type(fins->t));
       } else if (irt_isnum(fins->t) || (LJ_DUALNUM && irt_isint(fins->t)) ||