Merge branch 'master' into v2.1

2013-12-02 09:19:06 +01:00
parent 4593fb5e29 916f09d0a9
commit 5c7db3c4fc
4 changed files with 6 additions and 6 deletions
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -4169,7 +4169,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
    |
    |2:  // Upvalue is black. Check if new value is collectable and white.
    |  sub RD, LJ_TISGCV
-    |  cmp RD, LJ_TISNUM - LJ_TISGCV			// tvisgcv(v)
+    |  cmp RD, LJ_TNUMX - LJ_TISGCV			// tvisgcv(v)
    |  jbe <1
    |  test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES	// iswhite(v)
    |  jz <1