diff options
| author | Jes Cok <xigua67damn@gmail.com> | 2024-09-13 13:48:33 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-09-13 21:05:31 +0000 |
| commit | 0a2cc74f5a12b5cb7945e620a871b073b95ebee7 (patch) | |
| tree | de326f2429632a8e159a1df6432612232bf94c00 /src/cmd/cgo | |
| parent | 76e44f42c819e0fdd23918ea05a96b1f2d764de7 (diff) | |
| download | go-0a2cc74f5a12b5cb7945e620a871b073b95ebee7.tar.xz | |
cmd: make use of maps.{Copy, Clone}
Change-Id: I8a38b4c71c34d3544ee32be9c6e767bb1099a720
GitHub-Last-Rev: ff4cb4e91be3936465635f99d061f02999640ed9
GitHub-Pull-Request: golang/go#69424
Reviewed-on: https://go-review.googlesource.com/c/go/+/612735
Reviewed-by: Keith Randall <khr@golang.org>
Commit-Queue: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
Diffstat (limited to 'src/cmd/cgo')
| -rw-r--r-- | src/cmd/cgo/main.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go index 7a78cd270d..44252d9144 100644 --- a/src/cmd/cgo/main.go +++ b/src/cmd/cgo/main.go @@ -18,6 +18,7 @@ import ( "go/token" "internal/buildcfg" "io" + "maps" "os" "path/filepath" "reflect" @@ -598,12 +599,8 @@ func (p *Package) Record(f *File) { } // merge nocallback & noescape - for k, v := range f.NoCallbacks { - p.noCallbacks[k] = v - } - for k, v := range f.NoEscapes { - p.noEscapes[k] = v - } + maps.Copy(p.noCallbacks, f.NoCallbacks) + maps.Copy(p.noEscapes, f.NoEscapes) if f.ExpFunc != nil { p.ExpFunc = append(p.ExpFunc, f.ExpFunc...) |