diff options
| author | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
|---|---|---|
| committer | Chressie Himpel <chressie@google.com> | 2022-04-27 20:09:28 +0200 |
| commit | ec7f5165ddc680efbac18dc15b4905844d9e8db9 (patch) | |
| tree | eacc43345e3d6f0adfda16bfcf66e7e5096a85b9 /src/cmd/compile/internal/escape/escape.go | |
| parent | ca6fd39cf6498d4507fc7cdaced55620c283a503 (diff) | |
| parent | f0ee7fda636408b4f04ca3f3b11788f662c90610 (diff) | |
| download | go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.tar.gz go-ec7f5165ddc680efbac18dc15b4905844d9e8db9.zip | |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Change-Id: Ic5f71c04f08c03319c043f35be501875adb0a3b0
Diffstat (limited to 'src/cmd/compile/internal/escape/escape.go')
| -rw-r--r-- | src/cmd/compile/internal/escape/escape.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/escape/escape.go b/src/cmd/compile/internal/escape/escape.go index 4408a531eca..05fbe58bbc9 100644 --- a/src/cmd/compile/internal/escape/escape.go +++ b/src/cmd/compile/internal/escape/escape.go @@ -422,8 +422,6 @@ func (b *batch) paramTag(fn *ir.Func, narg int, f *types.Field) string { } if fn.Pragma&ir.UintptrEscapes != 0 { - fn.Pragma |= ir.UintptrKeepAlive - if f.Type.IsUintptr() { if diagnose { base.WarnfAt(f.Pos, "marking %v as escaping uintptr", name()) |