aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Chase <drchase@google.com>2017-03-28 17:55:26 -0400
committerMatthew Dempsky <mdempsky@google.com>2017-04-05 19:28:05 +0000
commit95a5b80e6d7096923dc0ffd8b88b1bd9e2670858 (patch)
treea8ff42ff097d730f840b27804ade331f7db49b1a
parentfe79c752686b52c1722315bdf15bb035f5377457 (diff)
downloadgo-95a5b80e6d7096923dc0ffd8b88b1bd9e2670858.tar.gz
go-95a5b80e6d7096923dc0ffd8b88b1bd9e2670858.zip
[release-branch.go1.8] cmd/compile: added special case for reflect header fields to esc
The uintptr-typed Data field in reflect.SliceHeader and reflect.StringHeader needs special treatment because it is really a pointer. Add the special treatment in walk for bug #19168 to escape analysis. Includes extra debugging that was helpful. Fixes #19743. Change-Id: I6dab5002f0d436c3b2a7cdc0156e4fc48a43d6fe Reviewed-on: https://go-review.googlesource.com/39616 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Austin Clements <austin@google.com>
-rw-r--r--src/cmd/compile/internal/gc/esc.go9
-rw-r--r--test/fixedbugs/issue19743.go31
2 files changed, 39 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/gc/esc.go b/src/cmd/compile/internal/gc/esc.go
index 4f37ff0e34..f4a70c4ac6 100644
--- a/src/cmd/compile/internal/gc/esc.go
+++ b/src/cmd/compile/internal/gc/esc.go
@@ -477,6 +477,10 @@ func escAnalyze(all []*Node, recursive bool) {
for _, n := range all {
if n.Op == ODCLFUNC {
n.Esc = EscFuncPlanned
+ if Debug['m'] > 3 {
+ Dump("escAnalyze", n)
+ }
+
}
}
@@ -1675,7 +1679,10 @@ func (e *EscState) escflows(dst, src *Node, why *EscStep) {
}
// Don't bother building a graph for scalars.
- if src.Type != nil && !haspointers(src.Type) {
+ if src.Type != nil && !haspointers(src.Type) && !isReflectHeaderDataField(src) {
+ if Debug['m'] > 3 {
+ fmt.Printf("%v::NOT flows:: %S <- %S\n", linestr(lineno), dst, src)
+ }
return
}
diff --git a/test/fixedbugs/issue19743.go b/test/fixedbugs/issue19743.go
new file mode 100644
index 0000000000..e57b19c8d0
--- /dev/null
+++ b/test/fixedbugs/issue19743.go
@@ -0,0 +1,31 @@
+// errorcheck -0 -m -l
+
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package foo
+
+// Escape analysis needs to treat the uintptr-typed reflect.*Header fields as pointers.
+
+import (
+ "reflect"
+ "unsafe"
+)
+
+type immutableBytes []byte
+
+// Bug was failure to leak param b.
+func toString(b immutableBytes) string { // ERROR "leaking param: b$"
+ var s string
+ if len(b) == 0 {
+ return s
+ }
+
+ strHeader := (*reflect.StringHeader)(unsafe.Pointer(&s)) // ERROR "toString &s does not escape$"
+ strHeader.Data = (*reflect.SliceHeader)(unsafe.Pointer(&b)).Data // ERROR "toString &b does not escape$"
+
+ l := len(b)
+ strHeader.Len = l
+ return s
+}