From: Michael Munday <munday@ca.ibm.com>
Date: Wed, 2 Nov 2016 15:41:40 +0000 (-0400)
Subject: bytes, strings: update s390x code to match amd64 changes
X-Git-Tag: go1.8beta1~383
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=53cc69170ae1a96163d3b6c14467e85dc8aa7266;p=gostls13.git

bytes, strings: update s390x code to match amd64 changes

Updates the s390x-specific files in these packages with the changes
to the amd64-specific files made during the review of CL 31690. I'd
like to keep these files in sync unless there is a reason to
diverge.

Change-Id: Id83e5ce11a45f877bdcc991d02b14416d1a2d8d2
Reviewed-on: https://go-review.googlesource.com/32574
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/bytes/bytes_s390x.go b/src/bytes/bytes_s390x.go
index 9eec3b7b5d..988c6034aa 100644
--- a/src/bytes/bytes_s390x.go
+++ b/src/bytes/bytes_s390x.go
@@ -32,6 +32,13 @@ func Index(s, sep []byte) int {
 		return 0
 	case n == 1:
 		return IndexByte(s, sep[0])
+	case n == len(s):
+		if Equal(sep, s) {
+			return 0
+		}
+		return -1
+	case n > len(s):
+		return -1
 	case n <= shortStringLen:
 		// Use brute force when s and sep both are small
 		if len(s) <= 64 {
@@ -68,13 +75,6 @@ func Index(s, sep []byte) int {
 			}
 		}
 		return -1
-	case n == len(s):
-		if Equal(sep, s) {
-			return 0
-		}
-		return -1
-	case n > len(s):
-		return -1
 	}
 	// Rabin-Karp search
 	hashsep, pow := hashStr(sep)
diff --git a/src/strings/strings_s390x.go b/src/strings/strings_s390x.go
index 64204ab09e..316a1b896b 100644
--- a/src/strings/strings_s390x.go
+++ b/src/strings/strings_s390x.go
@@ -32,6 +32,13 @@ func Index(s, sep string) int {
 		return 0
 	case n == 1:
 		return IndexByte(s, sep[0])
+	case n == len(s):
+		if sep == s {
+			return 0
+		}
+		return -1
+	case n > len(s):
+		return -1
 	case n <= shortStringLen:
 		// Use brute force when s and sep both are small
 		if len(s) <= 64 {
@@ -68,13 +75,6 @@ func Index(s, sep string) int {
 			}
 		}
 		return -1
-	case n == len(s):
-		if sep == s {
-			return 0
-		}
-		return -1
-	case n > len(s):
-		return -1
 	}
 	// Rabin-Karp search
 	hashsep, pow := hashStr(sep)