net: use runtime.AddCleanup instead of runtime.SetFinalizer

Adds TODO for replacement of runtime.SetFinalizer.

Fixes #70907

Change-Id: Ic009018a93ccc46a776ae34afac44635d2340cbf
Reviewed-on: https://go-review.googlesource.com/c/go/+/638557
Reviewed-by: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Carlos Amedee <carlos@golang.org>

diff --git a/src/net/fd_fake.go b/src/net/fd_fake.go
index ae567acc6994e65a42f99a4199acfbe38c50e0e9..946805ab940b7a2c49f42113759759501dbb70d2 100644 (file)
--- a/src/net/fd_fake.go
+++ b/src/net/fd_fake.go
@@ -104,6 +104,7 @@ func (fd *netFD) accept() (netfd *netFD, err error) {
 func (fd *netFD) setAddr(laddr, raddr Addr) {
        fd.laddr = laddr
        fd.raddr = raddr
+       // TODO Replace with runtime.AddCleanup.
        runtime.SetFinalizer(fd, (*netFD).Close)
 }
 
@@ -111,6 +112,7 @@ func (fd *netFD) Close() error {
        if fd.fakeNetFD != nil {
                return fd.fakeNetFD.Close()
        }
+       // TODO Replace with runtime.AddCleanup.
        runtime.SetFinalizer(fd, nil)
        return fd.pfd.Close()
 }

diff --git a/src/net/fd_posix.go b/src/net/fd_posix.go
index 93e6b5378eb75de217b40f9d2d2f10cd8fa8505b..023cd534e4206fe8a21c6f44dc8f10403b6b4a63 100644 (file)
--- a/src/net/fd_posix.go
+++ b/src/net/fd_posix.go
@@ -40,10 +40,12 @@ func (fd *netFD) name() string {
 func (fd *netFD) setAddr(laddr, raddr Addr) {
        fd.laddr = laddr
        fd.raddr = raddr
+       // TODO Replace with runtime.AddCleanup.
        runtime.SetFinalizer(fd, (*netFD).Close)
 }
 
 func (fd *netFD) Close() error {
+       // TODO Replace with runtime.AddCleanup.
        runtime.SetFinalizer(fd, nil)
        return fd.pfd.Close()
 }