diff options
| author | Cuong Manh Le <cuong.manhle.vn@gmail.com> | 2025-07-29 18:45:23 +0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-08-05 08:28:50 -0700 |
| commit | 5ab9f23977694ab87614fd30e081d294eb313efd (patch) | |
| tree | 3702479ac75143397f09baa0c3fcdfa63231f146 /src/cmd/compile | |
| parent | fcc036f03b07e58f76ed94bc9a9483ddef96f81c (diff) | |
| download | go-5ab9f23977694ab87614fd30e081d294eb313efd.tar.xz | |
cmd/compile, runtime: add checkptr instrumentation for unsafe.Add
Fixes #74431
Change-Id: Id651ea0b82599ccaff8816af0a56ddbb149b6f89
Reviewed-on: https://go-review.googlesource.com/c/go/+/692015
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Keith Randall <khr@golang.org>
Auto-Submit: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: t hepudds <thepudds1460@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Diffstat (limited to 'src/cmd/compile')
| -rw-r--r-- | src/cmd/compile/internal/walk/expr.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/walk/expr.go b/src/cmd/compile/internal/walk/expr.go index fbfc56a39c..b9e226b207 100644 --- a/src/cmd/compile/internal/walk/expr.go +++ b/src/cmd/compile/internal/walk/expr.go @@ -131,6 +131,14 @@ func walkExpr1(n ir.Node, init *ir.Nodes) ir.Node { n := n.(*ir.BinaryExpr) n.X = walkExpr(n.X, init) n.Y = walkExpr(n.Y, init) + if n.Op() == ir.OUNSAFEADD && ir.ShouldCheckPtr(ir.CurFunc, 1) { + // For unsafe.Add(p, n), just walk "unsafe.Pointer(uintptr(p)+uintptr(n))" + // for the side effects of validating unsafe.Pointer rules. + x := typecheck.ConvNop(n.X, types.Types[types.TUINTPTR]) + y := typecheck.Conv(n.Y, types.Types[types.TUINTPTR]) + conv := typecheck.ConvNop(ir.NewBinaryExpr(n.Pos(), ir.OADD, x, y), types.Types[types.TUNSAFEPTR]) + walkExpr(conv, init) + } return n case ir.OUNSAFESLICE: |