while (my $x ...) { ...; redo } shouldn't undef $x.

In the presence of 'my' in the conditional of a while(), until(),
or for(;;) loop, add an extra scope to the body so that redo
doesn't undef the lexical

p4raw-id: //depot/perl@24412

1 files changed, 26 insertions, 1 deletions

diff --git a/t/op/loopctl.t b/t/op/loopctl.t
index bc326c7b1a..11fb7c8ef7 100644
--- a/t/op/loopctl.t
+++ b/t/op/loopctl.t
@@ -31,7 +31,7 @@
 #
 #  -- .robin. <robin@kitsite.com>  2001-03-13
 
-print "1..43\n";
+print "1..46\n";
 
 my $ok;
 
@@ -967,3 +967,28 @@ print ($ok ? "ok 41\n" : "not ok 41\n");
 }
 
 
+# ensure that redo doesn't clear a lexical delcared in the condition
+
+{
+    my $i = 1;
+    while (my $x = $i) {
+	$i++;
+	redo if $i == 2;
+	print $x == 1 ? "" : "not ", "ok 44 - while/redo lexical life\n";
+	last;
+    }
+    $i = 1;
+    until (! (my $x = $i)) {
+	$i++;
+	redo if $i == 2;
+	print $x == 1 ? "" : "not ", "ok 45 - until/redo lexical life\n";
+	last;
+    }
+    for ($i = 1; my $x = $i; ) {
+	$i++;
+	redo if $i == 2;
+	print $x == 1 ? "" : "not ", "ok 46 - for/redo lexical life\n";
+	last;
+    }
+
+}