From: Rafael Garcia-Suarez Date: Thu, 29 Mar 2007 07:56:11 +0000 (+0000) Subject: Back out changes 30762 and 30763 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=050e63623eb7a1ee5c40a7115cbe0e102b5b6b5a;p=p5sagit%2Fp5-mst-13.2.git Back out changes 30762 and 30763 p4raw-id: //depot/perl@30776 --- diff --git a/pp.c b/pp.c index 00aa6e4..b2aa8e6 100644 --- a/pp.c +++ b/pp.c @@ -3014,13 +3014,13 @@ PP(pp_substr) I32 pos; I32 rem; I32 fail; - const int num_args = PL_op->op_private & 7; - const I32 lvalue = num_args <= 3 && ( PL_op->op_flags & OPf_MOD || LVRET ); + const I32 lvalue = PL_op->op_flags & OPf_MOD || LVRET; const char *tmps; const I32 arybase = CopARYBASE_get(PL_curcop); SV *repl_sv = NULL; const char *repl = NULL; STRLEN repl_len; + const int num_args = PL_op->op_private & 7; bool repl_need_utf8_upgrade = FALSE; bool repl_is_utf8 = FALSE; @@ -3115,8 +3115,7 @@ PP(pp_substr) } } - if (GIMME_V != G_VOID && !lvalue) - sv_setpvn(TARG, tmps, rem); + sv_setpvn(TARG, tmps, rem); #ifdef USE_LOCALE_COLLATE sv_unmagic(TARG, PERL_MAGIC_collxfrm); #endif