aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/string.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-11-14 12:10:52 -0500
committerRuss Cox <rsc@golang.org>2014-11-14 12:10:52 -0500
commit3e804631d905162d9e0fc1eba63bce6f95965a24 (patch)
tree5a3c5fe864320ef097c2cd8808620d15a1c21913 /src/runtime/string.go
parent9ad6b7e322deaf72e3c373952249dd078d6bd30e (diff)
parent743bdf612a63d631bac88a6b857094152ac33d5c (diff)
downloadgo-3e804631d905162d9e0fc1eba63bce6f95965a24.tar.gz
go-3e804631d905162d9e0fc1eba63bce6f95965a24.zip
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes. These are the files that had merge conflicts and have been edited by hand: malloc.go mem_linux.go mgc.go os1_linux.go proc1.go panic1.go runtime1.go LGTM=austin R=austin CC=golang-codereviews https://golang.org/cl/174180043
Diffstat (limited to 'src/runtime/string.go')
-rw-r--r--src/runtime/string.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/runtime/string.go b/src/runtime/string.go
index 0845c94e24..e01bc3b846 100644
--- a/src/runtime/string.go
+++ b/src/runtime/string.go
@@ -39,22 +39,18 @@ func concatstrings(a []string) string {
return s
}
-//go:nosplit
func concatstring2(a [2]string) string {
return concatstrings(a[:])
}
-//go:nosplit
func concatstring3(a [3]string) string {
return concatstrings(a[:])
}
-//go:nosplit
func concatstring4(a [4]string) string {
return concatstrings(a[:])
}
-//go:nosplit
func concatstring5(a [5]string) string {
return concatstrings(a[:])
}