mirror of
https://github.com/golang/go
synced 2024-11-11 19:11:35 -07:00
cmd/compile: don't assume pointer of a slice is non-nil
unsafe.SliceData can return pointers which are nil. That function gets lowered to the SSA OpSlicePtr, which the compiler assumes is non-nil. This used to be the case as OpSlicePtr was only used in situations where the bounds check already passed. But with unsafe.SliceData that is no longer the case. There are situations where we know it is nil. Use Bounded() to indicate that. I looked through all the uses of OSPTR and added SetBounded where it made sense. Most OSPTR results are passed directly to runtime calls (e.g. memmove), so even if we know they are non-nil that info isn't helpful. Fixes #59293 Change-Id: I437a15330db48e0082acfb1f89caf8c56723fc51 Reviewed-on: https://go-review.googlesource.com/c/go/+/479896 Reviewed-by: Matthew Dempsky <mdempsky@google.com> Reviewed-by: Keith Randall <khr@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Keith Randall <khr@golang.org>
This commit is contained in:
parent
1742691270
commit
61bc17f04e
@ -292,7 +292,7 @@ const (
|
||||
OEFACE // itable and data words of an empty-interface value.
|
||||
OITAB // itable word of an interface value.
|
||||
OIDATA // data word of an interface value in X
|
||||
OSPTR // base pointer of a slice or string.
|
||||
OSPTR // base pointer of a slice or string. Bounded==1 means known non-nil.
|
||||
OCFUNC // reference to c function pointer (not go func value)
|
||||
OCHECKNIL // emit code to ensure pointer/interface not nil
|
||||
ORESULT // result of a function call; Xoffset is stack offset
|
||||
|
@ -3199,7 +3199,10 @@ func (s *state) exprCheckPtr(n ir.Node, checkPtrOK bool) *ssa.Value {
|
||||
n := n.(*ir.UnaryExpr)
|
||||
a := s.expr(n.X)
|
||||
if n.X.Type().IsSlice() {
|
||||
return s.newValue1(ssa.OpSlicePtr, n.Type(), a)
|
||||
if n.Bounded() {
|
||||
return s.newValue1(ssa.OpSlicePtr, n.Type(), a)
|
||||
}
|
||||
return s.newValue1(ssa.OpSlicePtrUnchecked, n.Type(), a)
|
||||
} else {
|
||||
return s.newValue1(ssa.OpStringPtr, n.Type(), a)
|
||||
}
|
||||
|
@ -281,7 +281,9 @@ func walkStringToBytes(n *ir.ConvExpr, init *ir.Nodes) ir.Node {
|
||||
|
||||
// Copy from the static string data to the [n]byte.
|
||||
if len(sc) > 0 {
|
||||
as := ir.NewAssignStmt(base.Pos, ir.NewStarExpr(base.Pos, p), ir.NewStarExpr(base.Pos, typecheck.ConvNop(ir.NewUnaryExpr(base.Pos, ir.OSPTR, s), t.PtrTo())))
|
||||
sptr := ir.NewUnaryExpr(base.Pos, ir.OSPTR, s)
|
||||
sptr.SetBounded(true)
|
||||
as := ir.NewAssignStmt(base.Pos, ir.NewStarExpr(base.Pos, p), ir.NewStarExpr(base.Pos, typecheck.ConvNop(sptr, t.PtrTo())))
|
||||
appendWalkStmt(init, as)
|
||||
}
|
||||
|
||||
|
@ -193,6 +193,7 @@ func walkRange(nrange *ir.RangeStmt) ir.Node {
|
||||
// Pointer to current iteration position. Start on entry to the loop
|
||||
// with the pointer in hu.
|
||||
ptr := ir.NewUnaryExpr(base.Pos, ir.OSPTR, hs)
|
||||
ptr.SetBounded(true)
|
||||
huVal := ir.NewConvExpr(base.Pos, ir.OCONVNOP, types.Types[types.TUNSAFEPTR], ptr)
|
||||
huVal = ir.NewConvExpr(base.Pos, ir.OCONVNOP, types.Types[types.TUINTPTR], huVal)
|
||||
hu := typecheck.Temp(types.Types[types.TUINTPTR])
|
||||
|
28
test/fixedbugs/issue59293.go
Normal file
28
test/fixedbugs/issue59293.go
Normal file
@ -0,0 +1,28 @@
|
||||
// run
|
||||
|
||||
// Copyright 2023 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 main
|
||||
|
||||
import "unsafe"
|
||||
|
||||
//go:noinline
|
||||
func f(x []byte) bool {
|
||||
return unsafe.SliceData(x) != nil
|
||||
}
|
||||
|
||||
//go:noinline
|
||||
func g(x string) bool {
|
||||
return unsafe.StringData(x) != nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
if f(nil) {
|
||||
panic("bad f")
|
||||
}
|
||||
if g("") {
|
||||
panic("bad g")
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user