Merge branch 'master' into merge

VM/src/lgc.h

@@ -23,11 +23,10 @@
 #define GCSsweep 4
 
 /*
-** macro to tell when main invariant (white objects cannot point to black
+** The main invariant of the garbage collector, while marking objects,
-** ones) must be kept. During a collection, the sweep
+** is that a black object can never point to a white one. This invariant
-** phase may break the invariant, as objects turned white may point to
+** is not being enforced during a sweep phase, and is restored when sweep
-** still-black objects. The invariant is restored when sweep ends and
+** ends.
-** all objects are white again.
 */
 #define keepinvariant(g) ((g)->gcstate == GCSpropagate || (g)->gcstate == GCSpropagateagain || (g)->gcstate == GCSatomic)
 

tests/conformance/basic.lua

@@ -726,16 +726,15 @@ assert((function()
     return sum
 end)() == 15)
 
--- the reason why this test is interesting is that the table created here has arraysize=0 and a single hash element with key = 1.0
+-- ipairs will not iterate through hash part
--- ipairs must iterate through that
 assert((function()
-    local arr = { [1] = 42 }
+    local arr = { [1] = 1, [42] = 42, x = 10 }
     local sum = 0
     for i,v in ipairs(arr) do
     sum = sum + v
     end
     return sum
-end)() == 42)
+end)() == 1)
 
 -- the reason why this test is interesting is it ensures we do correct mutability analysis for locals
 local function chainTest(n)

tests/conformance/tables.lua

@@ -412,8 +412,8 @@ do
 
   assert(table.find({false, true}, true) == 2)
 
-  -- make sure table.find checks the hash portion as well by constructing a table literal that forces the value into the hash part
+  -- make sure table.find checks the hash portion as well
-  assert(table.find({[(1)] = true}, true) == 1)
+  assert(table.find({[(2)] = true}, true, 2) == 2)
 end
 
 -- test table.concat