undo CL 5687057 / 58bc8aae4abb

Fortunately we have never seen the panic on sockaddrToTCP
in the past year.

««« original CL description
net: panic if sockaddrToTCP returns nil incorrectly
Part of diagnosing the selfConnect bug
TBR=dsymonds

R=golang-dev
CC=golang-dev
https://golang.org/cl/5687057
»»»

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7137063

diff --git a/src/pkg/net/tcpsock_posix.go b/src/pkg/net/tcpsock_posix.go
index 4f9159566f3a4f83785680f01ff8a1a0f16c4e6f..bd5a2a287754d8d6624583039cd040f71e570eec 100644 (file)
--- a/src/pkg/net/tcpsock_posix.go
+++ b/src/pkg/net/tcpsock_posix.go
@@ -26,11 +26,6 @@ func sockaddrToTCP(sa syscall.Sockaddr) Addr {
                return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port}
        case *syscall.SockaddrInet6:
                return &TCPAddr{IP: sa.Addr[0:], Port: sa.Port, Zone: zoneToString(int(sa.ZoneId))}
-       default:
-               if sa != nil {
-                       // Diagnose when we will turn a non-nil sockaddr into a nil.
-                       panic("unexpected type in sockaddrToTCP")
-               }
        }
        return nil
 }