diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2003-08-21 04:42:56 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-08-21 04:42:56 +0000 |
| commit | ed08b2c61bbd3fcbc9931b185a9cf6a0a56f9acf (patch) | |
| tree | 3375c977eefe5b2ab3983ab6eca4cc75dd3e336a /pp_hot.c | |
| parent | c077e42241e3d5377a0e2cabae1cede852824d7c (diff) | |
| download | perl-ed08b2c61bbd3fcbc9931b185a9cf6a0a56f9acf.tar.gz | |
Retract #19064, broke mod_perl flushing (localisation of $|).
http://public.activestate.com/cgi-bin/perlbrowse?patch=19064
http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2003-08/msg01466.html
p4raw-id: //depot/perl@20795
Diffstat (limited to 'pp_hot.c')
| -rw-r--r-- | pp_hot.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2328,10 +2328,10 @@ PP(pp_leavesub) } PUTBACK; - LEAVE; POPSUB(cx,sv); /* Stack values are safe: release CV and @_ ... */ PL_curpm = newpm; /* ... and pop $1 et al */ + LEAVE; LEAVESUB(sv); return pop_return(); } @@ -2384,9 +2384,9 @@ PP(pp_leavesublv) * the refcounts so the caller gets a live guy. Cannot set * TEMP, so sv_2mortal is out of question. */ if (!CvLVALUE(cx->blk_sub.cv)) { - LEAVE; POPSUB(cx,sv); PL_curpm = newpm; + LEAVE; LEAVESUB(sv); DIE(aTHX_ "Can't modify non-lvalue subroutine call"); } @@ -2395,9 +2395,9 @@ PP(pp_leavesublv) EXTEND_MORTAL(1); if (MARK == SP) { if (SvFLAGS(TOPs) & (SVs_TEMP | SVs_PADTMP | SVf_READONLY)) { - LEAVE; POPSUB(cx,sv); PL_curpm = newpm; + LEAVE; LEAVESUB(sv); DIE(aTHX_ "Can't return %s from lvalue subroutine", SvREADONLY(TOPs) ? (TOPs == &PL_sv_undef) ? "undef" @@ -2410,9 +2410,9 @@ PP(pp_leavesublv) } } else { /* Should not happen? */ - LEAVE; POPSUB(cx,sv); PL_curpm = newpm; + LEAVE; LEAVESUB(sv); DIE(aTHX_ "%s returned from lvalue subroutine in scalar context", (MARK > SP ? "Empty array" : "Array")); @@ -2426,9 +2426,9 @@ PP(pp_leavesublv) && SvFLAGS(*mark) & (SVs_TEMP | SVs_PADTMP | SVf_READONLY)) { /* Might be flattened array after $#array = */ PUTBACK; - LEAVE; POPSUB(cx,sv); PL_curpm = newpm; + LEAVE; LEAVESUB(sv); DIE(aTHX_ "Can't return a %s from lvalue subroutine", SvREADONLY(TOPs) ? "readonly value" : "temporary"); @@ -2480,10 +2480,10 @@ PP(pp_leavesublv) } PUTBACK; - LEAVE; POPSUB(cx,sv); /* Stack values are safe: release CV and @_ ... */ PL_curpm = newpm; /* ... and pop $1 et al */ + LEAVE; LEAVESUB(sv); return pop_return(); } |