Convert Perl_sv_pos_u2b_proper() to Perl_sv_pos_u2b_flags().

Change from a value/return offset pointer to passing a Unicode offset, and
returning a byte offset. The optional length value/return pointer remains.
Add a flags argument, passed to SvPV_flags(). This allows the caller to
specify whether mg_get() should be called on sv.

1 files changed, 3 insertions, 3 deletions

diff --git a/pp.c b/pp.c
index 8f01e85621..3e2ed48854 100644
--- a/pp.c
+++ b/pp.c
@@ -3204,10 +3204,10 @@ PP(pp_substr)
 	/* pos1_iv and pos2_iv both in 0..curlen, so the cast is safe */
 	const STRLEN pos = (STRLEN)( (UV)pos1_iv );
 	const STRLEN len = (STRLEN)( (UV)pos2_iv - (UV)pos1_iv );
-	STRLEN byte_pos = pos;
 	STRLEN byte_len = len;
-	if (utf8_curlen)
-	    sv_pos_u2b_proper(sv, &byte_pos, &byte_len);
+	STRLEN byte_pos = utf8_curlen
+	    ? sv_pos_u2b_flags(sv, pos, &byte_len, SV_CONST_RETURN) : pos;
+
 	tmps += byte_pos;
 	/* we either return a PV or an LV. If the TARG hasn't been used
 	 * before, or is of that type, reuse it; otherwise use a mortal