qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-23 11:20:17 -06:00
Code Releases Activity

cmd/compile: fix unsafe.Pointer liveness for Syscall-like functions

Browse Source 
The package unsafe docs say it's safe to convert an unsafe.Pointer to
uintptr in the argument list to an assembly function, but it was
erroneously only detecting normal pointers converted to unsafe.Pointer
and then to intptr.

Fixes #23051.

Change-Id: Id1be19f6d8f26f2d17ba815191717d2f4f899732
Reviewed-on: https://go-review.googlesource.com/82817
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Matthew Dempsky 2017-12-07 23:04:50 -08:00
parent a9410281c2
commit 840fad13ec
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/compile/internal/gc/order.go
View File

@ -395,11 +395,11 @@ func ordercall(n *Node, order *Order) {
// by copying it into a temp and marking that temp
// still alive when we pop the temp stack.
xp := n.List.Addr(i)
for (*xp).Op == OCONVNOP && !(*xp).Type.IsPtr() {
for (*xp).Op == OCONVNOP && !(*xp).Type.IsUnsafePtr() {
xp = &(*xp).Left
}
x := *xp
if x.Type.IsPtr() {
if x.Type.IsUnsafePtr() {
x = ordercopyexpr(x, x.Type, order, 0)
x.Name.SetKeepalive(true)
*xp = x

12
test/live_syscall.go
View File

@ -26,3 +26,15 @@ func h() {
var v int
syscall.Syscall(0, 1, uintptr(unsafe.Pointer(&v)), 2) // ERROR "live at call to Syscall: .?autotmp" "h &v does not escape"
}
func i() {
var t int
p := unsafe.Pointer(&t) // ERROR "i &t does not escape"
f(uintptr(p)) // ERROR "live at call to f: .?autotmp"
}
func j() {
var v int
p := unsafe.Pointer(&v) // ERROR "j &v does not escape"
syscall.Syscall(0, 1, uintptr(p), 2) // ERROR "live at call to Syscall: .?autotmp"
}