From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 23 Mar 2006 11:06:52 +0000 (+0000)
Subject: Use the cache in S_sv_pos_u2b_cached() when the desired offset is
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=668af93f1915d2f416c8e13d6ab3b8f85d22477b;p=p5sagit%2Fp5-mst-13.2.git

Use the cache in S_sv_pos_u2b_cached() when the desired offset is
between the start of the string and the cached location.
Remove unneccesary else from Perl_sv_pos_b2u().

p4raw-id: //depot/perl@27579
---

diff --git a/sv.c b/sv.c
index 0c71aa9..6661670 100644
--- a/sv.c
+++ b/sv.c
@@ -5565,7 +5565,8 @@ S_sv_pos_u2b_cached(pTHX_ SV *sv, MAGIC **mgp, const U8 *const start,
 		/* An exact match. */
 		return cache[1];
 	    }
-	    else if (cache[0] < uoffset) {
+
+	    if (cache[0] < uoffset) {
 		/* The cache already knows part of the way.   */
 		if (cache[0] > uoffset0) {
 		    /* The cache knows more than the passed in pair  */
@@ -5583,8 +5584,14 @@ S_sv_pos_u2b_cached(pTHX_ SV *sv, MAGIC **mgp, const U8 *const start,
 			+ S_sv_pos_u2b_forwards(aTHX_ start + boffset0,
 						send, uoffset - uoffset0);
 		}
-		found = TRUE;
+	    } else {
+		boffset = boffset0
+		    + S_sv_pos_u2b_midway(aTHX_ start + boffset0,
+					  start + cache[1],
+					  uoffset - uoffset0,
+					  cache[0] - uoffset0);
 	    }
+	    found = TRUE;
 	}
 	else if ((*mgp)->mg_len != -1) {
 	    /* If we can take advantage of a passed in offset, do so.  */
@@ -5805,10 +5812,10 @@ Perl_sv_pos_b2u(pTHX_ register SV* sv, I32* offsetp)
 	    if (cache[1] == byte) {
 		/* An exact match. */
 		*offsetp = cache[0];
-
 		return;
 	    }
-	    else if (cache[1] < byte) {
+
+	    if (cache[1] < byte) {
 		/* We already know part of the way. */
 		if (mg->mg_len != -1) {
 		    /* Actually, we know the end too.  */