strings: fix and reenable amd64 Index for 17-31 byte strings

Fixes #15689

Change-Id: I56d0103738cc35cd5bc5e77a0e0341c0dd55530e
Reviewed-on: https://go-review.googlesource.com/23440
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Ilya Tocar <ilya.tocar@intel.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Nigel Tao <nigeltao@golang.org>
This commit is contained in:
Ilya Tocar 2016-05-25 16:33:19 +03:00 committed by Nigel Tao
parent 42da35c699
commit 429bbf3312
3 changed files with 39 additions and 3 deletions

View file

@ -190,6 +190,43 @@ func TestLastIndexByte(t *testing.T) {
}
}
func simpleIndex(s, sep string) int {
n := len(sep)
for i := n; i <= len(s); i++ {
if s[i-n:i] == sep {
return i - n
}
}
return -1
}
func TestIndexRandom(t *testing.T) {
const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
for times := 0; times < 10; times++ {
for strLen := 5 + rand.Intn(5); strLen < 140; strLen += 10 { // Arbitrary
s1 := make([]byte, strLen)
for i := range s1 {
s1[i] = chars[rand.Intn(len(chars))]
}
s := string(s1)
for i := 0; i < 50; i++ {
begin := rand.Intn(len(s) + 1)
end := begin + rand.Intn(len(s)+1-begin)
sep := s[begin:end]
if i%4 == 0 {
pos := rand.Intn(len(sep) + 1)
sep = sep[:pos] + "A" + sep[pos:]
}
want := simpleIndex(s, sep)
res := Index(s, sep)
if res != want {
t.Errorf("Index(%s,%s) = %d; want %d", s, sep, res, want)
}
}
}
}
}
var indexRuneTests = []struct {
s string
rune rune