another long-standing eval bug: return doesn't reset $@ correctly

p4raw-id: //depot/perl@5660

1 files changed, 25 insertions, 1 deletions

diff --git a/t/op/eval.t b/t/op/eval.t
index ea6caf43bd..183892389f 100755
--- a/t/op/eval.t
+++ b/t/op/eval.t
@@ -1,6 +1,6 @@
 #!./perl
 
-print "1..38\n";
+print "1..40\n";
 
 eval 'print "ok 1\n";';
 
@@ -182,3 +182,27 @@ print $@;
     print $c eq '2222222222' ? "ok $x\n" : "# $c\nnot ok $x\n";
     $x++;
 }
+
+# return from eval {} should clear $@ correctly
+{
+    my $status = eval {
+	eval { die };
+	print "# eval { return } test\n";
+	return; # removing this changes behavior
+    };
+    print "not " if $@;
+    print "ok $x\n";
+    $x++;
+}
+
+# ditto for eval ""
+{
+    my $status = eval q{
+	eval q{ die };
+	print "# eval q{ return } test\n";
+	return; # removing this changes behavior
+    };
+    print "not " if $@;
+    print "ok $x\n";
+    $x++;
+}