From 1fadbc1a76b2d9a11453ef4e21b77c353493ac2c Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Thu, 1 Mar 2018 22:22:44 +0000
Subject: Revert "runtime: use bytes.IndexByte in findnull"

This reverts commit 7365fac2dbd01960268ee051ed03d961258d4ef4.

Reason for revert: breaks the build on some architectures, reading unmapped pages?

Change-Id: I3a8c02dc0b649269faacea79ecd8213defa97c54
Reviewed-on: https://go-review.googlesource.com/97995
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 src/runtime/string.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/runtime/string.go')

diff --git a/src/runtime/string.go b/src/runtime/string.go
index 0ea162235c..5c83895995 100644
--- a/src/runtime/string.go
+++ b/src/runtime/string.go
@@ -407,9 +407,12 @@ func findnull(s *byte) int {
 	if s == nil {
 		return 0
 	}
-	ss := stringStruct{unsafe.Pointer(s), maxAlloc/2 - 1}
-	t := *(*string)(unsafe.Pointer(&ss))
-	return stringsIndexByte(t, 0)
+	p := (*[maxAlloc/2 - 1]byte)(unsafe.Pointer(s))
+	l := 0
+	for p[l] != 0 {
+		l++
+	}
+	return l
 }
 
 func findnullw(s *uint16) int {
-- 
cgit v1.3-5-g9baa