Integrate:
authorTim Bunce <Tim.Bunce@pobox.com>
Thu, 20 Nov 2008 13:17:19 +0000 (13:17 +0000)
committerNicholas Clark <nick@ccl4.org>
Fri, 21 Nov 2008 19:02:42 +0000 (19:02 +0000)
[ 34897]
Integrate:
[ 34896]
Subject: Hard-coded Perl_pp_entersub and Perl_pp_entereval should use PL_ppaddr
Message-ID: <20081120131719.GA32120@timac.local>

[tweaked for blead because of change 27941]
[and then tweaked back]
p4raw-link: @34897 on //depot/maint-5.10/perl: dc0272e595091b6e2b2f834ecb915afab8e461f7
p4raw-link: @34896 on //depot/perl: 139d0ce69f7cc12a8ffc1a75bbb5c65306d08d35

p4raw-id: //depot/maint-5.8/perl@34899
p4raw-integrated: from //depot/maint-5.10/perl@34895 'edit in' perl.c
(@34707..) 'merge in' gv.c (@34715..)

gv.c
perl.c

index e809c12..fb8bcfc 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -1976,7 +1976,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags)
     PUSHs((SV*)cv);
     PUTBACK;
 
-    if ((PL_op = Perl_pp_entersub(aTHX)))
+    if ((PL_op = PL_ppaddr[OP_ENTERSUB](aTHX)))
       CALLRUNOPS(aTHX);
     LEAVE;
     SPAGAIN;
diff --git a/perl.c b/perl.c
index d8a57c9..82e5538 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2796,9 +2796,9 @@ S_call_body(pTHX_ const OP *myop, bool is_eval)
 {
     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);