X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.c;h=b2aa8e6677d9a02950cce53d922812e34597c128;hb=8c7d55fc02cca4e0edf1324c36f667376289f8d2;hp=04fab022d2a34c91596a8ffdd4955cba80b734ee;hpb=81e3fc254f697a77f623afd4d35468dd9ca691c7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.c b/pp.c
index 04fab02..b2aa8e6 100644
--- a/pp.c
+++ b/pp.c
@@ -323,8 +323,7 @@ PP(pp_av2arylen)
     AV * const av = (AV*)TOPs;
     SV ** const sv = Perl_av_arylen_p(aTHX_ (AV*)av);
     if (!*sv) {
-	*sv = newSV(0);
-	sv_upgrade(*sv, SVt_PVMG);
+	*sv = newSV_type(SVt_PVMG);
 	sv_magic(*sv, (SV*)av, PERL_MAGIC_arylen, NULL, 0);
     }
     SETs(*sv);
@@ -1538,7 +1537,7 @@ PP(pp_repeat)
 		SvCUR_set(TARG, 0);
 	    else {
 		const STRLEN max = (UV)count * len;
-		if (len > ((MEM_SIZE)~0)/count)
+		if (len > MEM_SIZE_MAX / count)
 		     Perl_croak(aTHX_ oom_string_extend);
 	        MEM_WRAP_CHECK_1(max, char, oom_string_extend);
 		SvGROW(TARG, max + 1);
@@ -4762,7 +4761,7 @@ PP(pp_split)
 		s = orig + (m - s);
 		strend = s + (strend - m);
 	    }
-	    m = rx->startp[0] + orig;
+	    m = rx->offs[0].start + orig;
 	    dstr = newSVpvn(s, m-s);
 	    if (make_mortal)
 		sv_2mortal(dstr);
@@ -4772,8 +4771,8 @@ PP(pp_split)
 	    if (rx->nparens) {
 		I32 i;
 		for (i = 1; i <= (I32)rx->nparens; i++) {
-		    s = rx->startp[i] + orig;
-		    m = rx->endp[i] + orig;
+		    s = rx->offs[i].start + orig;
+		    m = rx->offs[i].end + orig;
 
 		    /* japhy (07/27/01) -- the (m && s) test doesn't catch
 		       parens that didn't match -- they should be set to
@@ -4790,7 +4789,7 @@ PP(pp_split)
 		    XPUSHs(dstr);
 		}
 	    }
-	    s = rx->endp[0] + orig;
+	    s = rx->offs[0].end + orig;
 	}
     }