Change 29978 by [EMAIL PROTECTED] on 2007/01/25 21:01:04

        Fix 29976 (somehow I can't have run make test) - in maint there need to
        be push_return() and pop_return() wrapping the faked up eval for
        constant folding.

Affected files ...

... //depot/maint-5.8/perl/op.c#180 edit

Differences ...

==== //depot/maint-5.8/perl/op.c#180 (text) ====
Index: perl/op.c
--- perl/op.c#179~29976~        2007-01-25 09:25:09.000000000 -0800
+++ perl/op.c   2007-01-25 13:01:04.000000000 -0800
@@ -2164,6 +2164,7 @@
     PL_op = curop;
 
     oldscope = PL_scopestack_ix;
+    push_return(NULL);
     create_eval_scope(G_FAKINGEVAL);
 
     PL_warnhook = PERL_WARNHOOK_FATAL;
@@ -2206,8 +2207,10 @@
     PL_warnhook = oldwarnhook;
     PL_diehook  = olddiehook;
 
-    if (PL_scopestack_ix > oldscope)
+    if (PL_scopestack_ix > oldscope) {
        delete_eval_scope();
+       pop_return();
+    }
 
     if (ret)
        goto nope;
End of Patch.

Reply via email to