lua
diff --git a/‎lparser.c‎
Lines changed: 1 addition & 1 deletion b/‎lparser.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎testes/locals.lua‎
Lines changed: 19 additions & 0 deletions b/‎testes/locals.lua‎
Lines changed: 19 additions & 0 deletions
@@ -1614,7 +1614,6 @@ static void repeatstat (LexState *ls, int line) {
   statlist(ls);
   check_match(ls, TK_UNTIL, TK_REPEAT, line);
   condexit = cond(ls);  /* read condition (inside scope block) */
-  leaveblock(fs);  /* finish scope */
   if (bl2.upval) {  /* upvalues? */
     int exit = luaK_jump(fs);  /* normal exit must jump over fix */
     luaK_patchtohere(fs, condexit);  /* repetition must close upvalues */
@@ -1623,6 +1622,7 @@ static void repeatstat (LexState *ls, int line) {
     luaK_patchtohere(fs, exit);  /* normal exit comes to here */
   }
   luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
+  leaveblock(fs);  /* finish scope */
   leaveblock(fs);  /* finish loop */
 }
 
 
@@ -1179,6 +1179,25 @@ if rawget(_G, "T") then
 end
 
 
+do
+  -- detail in scopes of variables in the loop of 'repeat-until'
+  local res = {}
+  local function foo (a)
+    repeat
+      local x
+      local i <close> = setmetatable({}, {__close = function ()
+              res[#res + 1] = debug.getlocal(2, 2)   -- get 'x'
+              res[#res + 1] = debug.getlocal(2, 3)   -- get 'i'
+              a = true
+            end})
+    until a
+  end
+  foo(false)
+  -- loop variables still in scope when closing 'i', both when 'repeat'
+  -- repeats and when 'repeat' stops.
+  assert(res[1] == "x" and res[2] == "i" and res[3] == "x" and res[4] == "i")
+end
+
 
 -- to-be-closed variables in generic for loops
 do
Original file line number	Diff line number	Diff line change
@@ -1614,7 +1614,6 @@ static void repeatstat (LexState *ls, int line) {
1614	1614	statlist(ls);
1615	1615	check_match(ls, TK_UNTIL, TK_REPEAT, line);
1616	1616	condexit = cond(ls); /* read condition (inside scope block) */
1617		- leaveblock(fs); /* finish scope */
1618	1617	if (bl2.upval) { /* upvalues? */
1619	1618	int exit = luaK_jump(fs); /* normal exit must jump over fix */
1620	1619	luaK_patchtohere(fs, condexit); /* repetition must close upvalues */
@@ -1623,6 +1622,7 @@ static void repeatstat (LexState *ls, int line) {
1623	1622	luaK_patchtohere(fs, exit); /* normal exit comes to here */
1624	1623	}
1625	1624	luaK_patchlist(fs, condexit, repeat_init); /* close the loop */
	1625	+ leaveblock(fs); /* finish scope */
1626	1626	leaveblock(fs); /* finish loop */
1627	1627	}
1628	1628