Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: only escape unsafe.Pointer conversions when -d=checkptr=2

Browse source 
Escaping all unsafe.Pointer conversions for -d=checkptr seems like it
might be a little too aggressive to enable for -race/-msan mode, since
at least some tests are written to expect unsafe.Pointer conversions
to not affect escape analysis.

So instead only enable that functionality behind -d=checkptr=2.

Updates #22218.
Updates #34959.

Change-Id: I2f0a774ea5961dabec29bc5b8ebe387a1b90d27b
Reviewed-on: https://go-review.googlesource.com/c/go/+/201840
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Matthew Dempsky 2019-10-17 16:31:19 -07:00
parent 5375c71289
commit 46aa8354fa
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/compile/internal/gc/escape.go
View file

@ -471,8 +471,8 @@ func (e *Escape) exprSkipInit(k EscHole, n *Node) {
e.discard(max) e.discard(max)
case OCONV, OCONVNOP: case OCONV, OCONVNOP:
if checkPtr(e.curfn) && n.Type.Etype == TUNSAFEPTR && n.Left.Type.IsPtr() { if checkPtr(e.curfn, 2) && n.Type.Etype == TUNSAFEPTR && n.Left.Type.IsPtr() {
// When -d=checkptr is enabled, treat // When -d=checkptr=2 is enabled, treat
// conversions to unsafe.Pointer as an // conversions to unsafe.Pointer as an
// escaping operation. This allows better // escaping operation. This allows better
// runtime instrumentation, since we can more // runtime instrumentation, since we can more

5
src/cmd/compile/internal/gc/main.go
View file

@ -94,6 +94,11 @@ const debugHelpHeader = `usage: -d arg[,arg]* and arg is <key>[=<value>]
const debugHelpFooter = ` const debugHelpFooter = `
<value> is key-specific. <value> is key-specific.
Key "checkptr" supports values:
"0": instrumentation disabled
"1": conversions involving unsafe.Pointer are instrumented
"2": conversions to unsafe.Pointer force heap allocation
Key "pctab" supports values: Key "pctab" supports values:
"pctospadj", "pctofile", "pctoline", "pctoinline", "pctopcdata" "pctospadj", "pctofile", "pctoline", "pctoinline", "pctopcdata"
` `

9
src/cmd/compile/internal/gc/walk.go
View file

@ -951,7 +951,7 @@ opswitch:
case OCONV, OCONVNOP: case OCONV, OCONVNOP:
n.Left = walkexpr(n.Left, init) n.Left = walkexpr(n.Left, init)
if n.Op == OCONVNOP && checkPtr(Curfn) { if n.Op == OCONVNOP && checkPtr(Curfn, 1) {
if n.Type.IsPtr() && n.Left.Type.Etype == TUNSAFEPTR { // unsafe.Pointer to *T if n.Type.IsPtr() && n.Left.Type.Etype == TUNSAFEPTR { // unsafe.Pointer to *T
n = walkCheckPtrAlignment(n, init) n = walkCheckPtrAlignment(n, init)
break break
@ -3976,7 +3976,8 @@ func walkCheckPtrArithmetic(n *Node, init *Nodes) *Node {
} }
// checkPtr reports whether pointer checking should be enabled for // checkPtr reports whether pointer checking should be enabled for
// function fn. // function fn at a given level. See debugHelpFooter for defined
func checkPtr(fn *Node) bool { // levels.
return Debug_checkptr != 0 && fn.Func.Pragma&NoCheckPtr == 0 func checkPtr(fn *Node, level int) bool {
return Debug_checkptr >= level && fn.Func.Pragma&NoCheckPtr == 0
} }