diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2022-08-31 19:05:55 +0200 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-09-02 17:45:18 +0000 |
| commit | 274528eca1ebbb3aa5203e77152925ca1de98601 (patch) | |
| tree | f1aa6f61c0bbdfaf2bc66c5d452da3c3078c73da /src/cmd/compile/internal/base | |
| parent | 54c7bc9cff748e6554e53fbbbf823fdd214d0482 (diff) | |
| download | go-274528eca1ebbb3aa5203e77152925ca1de98601.tar.xz | |
cmd/compile/internal/base: use runtime.KeepAlive in MapFile
Go 1.17 will be used instead of Go 1.4 as minimum required version for
bootstrap, so runtime.KeepAlive introduced in Go 1.7 can be used in
cmd/compile.
For #44505
Change-Id: I96bd6619c4476e36ee1d93ca049da622a3a78f97
Reviewed-on: https://go-review.googlesource.com/c/go/+/427114
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Auto-Submit: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/base')
| -rw-r--r-- | src/cmd/compile/internal/base/mapfile_mmap.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/cmd/compile/internal/base/mapfile_mmap.go b/src/cmd/compile/internal/base/mapfile_mmap.go index c1616db8e9..e154a3f9e0 100644 --- a/src/cmd/compile/internal/base/mapfile_mmap.go +++ b/src/cmd/compile/internal/base/mapfile_mmap.go @@ -10,6 +10,7 @@ package base import ( "os" "reflect" + "runtime" "syscall" "unsafe" ) @@ -27,7 +28,7 @@ func MapFile(f *os.File, offset, length int64) (string, error) { length += x buf, err := syscall.Mmap(int(f.Fd()), offset, int(length), syscall.PROT_READ, syscall.MAP_SHARED) - keepAlive(f) + runtime.KeepAlive(f) if err != nil { return "", err } @@ -43,7 +44,3 @@ func MapFile(f *os.File, offset, length int64) (string, error) { return res, nil } - -// keepAlive is a reimplementation of runtime.KeepAlive, which wasn't -// added until Go 1.7, whereas we need to compile with Go 1.4. -var keepAlive = func(interface{}) {} |