Change 34899 by [EMAIL PROTECTED] on 2008/11/21 19:02:42
Integrate:
[ 34897]
Integrate:
[ 34896]
Subject: Hard-coded Perl_pp_entersub and Perl_pp_entereval should use
PL_ppaddr
From: Tim Bunce <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Thu, 20 Nov 2008 13:17:19 +0000
[tweaked for blead because of change 27941]
[and then tweaked back]
Affected files ...
... //depot/maint-5.8/perl/gv.c#121 integrate
... //depot/maint-5.8/perl/perl.c#238 integrate
Differences ...
==== //depot/maint-5.8/perl/gv.c#121 (text) ====
Index: perl/gv.c
--- perl/gv.c#120~34726~ 2008-11-04 13:39:52.000000000 -0800
+++ perl/gv.c 2008-11-21 11:02:42.000000000 -0800
@@ -1976,7 +1976,7 @@
PUSHs((SV*)cv);
PUTBACK;
- if ((PL_op = Perl_pp_entersub(aTHX)))
+ if ((PL_op = PL_ppaddr[OP_ENTERSUB](aTHX)))
CALLRUNOPS(aTHX);
LEAVE;
SPAGAIN;
==== //depot/maint-5.8/perl/perl.c#238 (text) ====
Index: perl/perl.c
--- perl/perl.c#237~34718~ 2008-11-04 01:38:17.000000000 -0800
+++ perl/perl.c 2008-11-21 11:02:42.000000000 -0800
@@ -2796,9 +2796,9 @@
{
if (PL_op == myop) {
if (is_eval)
- PL_op = Perl_pp_entereval(aTHX); /* this doesn't do a POPMARK */
+ PL_op = PL_ppaddr[OP_ENTEREVAL](aTHX); /* this doesn't do a
POPMARK */
else
- PL_op = Perl_pp_entersub(aTHX); /* this does */
+ PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); /* this does */
}
if (PL_op)
CALLRUNOPS(aTHX);
End of Patch.
