Change 30241: Move the pop_return() into Perl_delete_eval_scope() from both of its

[Nicholas Clark]

Change 30241 by [EMAIL PROTECTED] on 2007/02/12 20:43:49

        Move the pop_return() into Perl_delete_eval_scope() from both of its
        callers.

Affected files ...

... //depot/maint-5.8/perl/op.c#197 edit
... //depot/maint-5.8/perl/perl.c#203 edit
... //depot/maint-5.8/perl/pp_ctl.c#173 edit

Differences ...

==== //depot/maint-5.8/perl/op.c#197 (text) ====
Index: perl/op.c
--- perl/op.c#196~30181~        2007-02-09 09:20:56.000000000 -0800
+++ perl/op.c   2007-02-12 12:43:49.000000000 -0800
@@ -2186,7 +2186,6 @@
 
     if (PL_scopestack_ix > oldscope) {
        delete_eval_scope();
-       pop_return();
     }
 
     if (ret)

==== //depot/maint-5.8/perl/perl.c#203 (text) ====
Index: perl/perl.c
--- perl/perl.c#202~30166~      2007-02-07 14:59:15.000000000 -0800
+++ perl/perl.c 2007-02-12 12:43:49.000000000 -0800
@@ -2773,7 +2773,6 @@
 
        if (PL_scopestack_ix > oldscope) {
            delete_eval_scope();
-           pop_return();
        }
        JMPENV_POP;
     }

==== //depot/maint-5.8/perl/pp_ctl.c#173 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#172~30173~    2007-02-08 06:22:18.000000000 -0800
+++ perl/pp_ctl.c       2007-02-12 12:43:49.000000000 -0800
@@ -3573,6 +3573,7 @@
     POPEVAL(cx);
     PL_curpm = newpm;
     LEAVE;
+    pop_return();
     PERL_UNUSED_VAR(newsp);
     PERL_UNUSED_VAR(gimme);
     PERL_UNUSED_VAR(optype);
End of Patch.