Merge branch 'golang:master' into h2c-disable-keepalive

Author: WeidiDeng

bpf/instructions_test.go

@@ -6,7 +6,7 @@ package bpf
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -98,7 +98,7 @@ func TestInterop(t *testing.T) {
 	}
 	t.Logf("Assembled program is %d instructions long", len(out))
 
-	bs, err := ioutil.ReadFile(allInstructionsExpected)
+	bs, err := os.ReadFile(allInstructionsExpected)
 	if err != nil {
 		t.Fatalf("reading %s: %s", allInstructionsExpected, err)
 	}

bpf/vm_bpf_test.go

@@ -14,6 +14,7 @@ import (
 	"golang.org/x/net/ipv4"
 	"golang.org/x/net/ipv6"
 	"golang.org/x/net/nettest"
+	"golang.org/x/sys/cpu"
 )
 
 // A virtualMachine is a BPF virtual machine which can process an
@@ -22,18 +23,6 @@ type virtualMachine interface {
 	Run(in []byte) (int, error)
 }
 
-// canUseOSVM indicates if the OS BPF VM is available on this platform.
-func canUseOSVM() bool {
-	// OS BPF VM can only be used on platforms where x/net/ipv4 supports
-	// attaching a BPF program to a socket.
-	switch runtime.GOOS {
-	case "linux":
-		return true
-	}
-
-	return false
-}
-
 // All BPF tests against both the Go VM and OS VM are assumed to
 // be used with a UDP socket. As a result, the entire contents
 // of a UDP datagram is sent through the BPF program, but only
@@ -55,11 +44,10 @@ func testVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func(), err
 		t: t,
 	}
 
-	// If available, add the OS VM for tests which verify that both the Go
-	// VM and OS VM have exactly the same output for the same input program
-	// and packet.
+	// For linux with a little endian CPU, the Go VM and OS VM have exactly the
+	// same output for the same input program and packet. Compare both.
 	done := func() {}
-	if canUseOSVM() {
+	if runtime.GOOS == "linux" && !cpu.IsBigEndian {
 		osVM, osVMDone := testOSVM(t, filter)
 		done = func() { osVMDone() }
 		mvm.osVM = osVM

bpf/vm_instructions.go

@@ -94,7 +94,7 @@ func jumpIfCommon(cond JumpTest, skipTrue, skipFalse uint8, regA uint32, value u
 
 func loadAbsolute(ins LoadAbsolute, in []byte) (uint32, bool) {
 	offset := int(ins.Off)
-	size := int(ins.Size)
+	size := ins.Size
 
 	return loadCommon(in, offset, size)
 }
@@ -121,7 +121,7 @@ func loadExtension(ins LoadExtension, in []byte) uint32 {
 
 func loadIndirect(ins LoadIndirect, in []byte, regX uint32) (uint32, bool) {
 	offset := int(ins.Off) + int(regX)
-	size := int(ins.Size)
+	size := ins.Size
 
 	return loadCommon(in, offset, size)
 }

context/context_test.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.7
-// +build !go1.7
 
 package context
 

context/ctxhttp/ctxhttp_test.go

@@ -3,14 +3,12 @@
 // license that can be found in the LICENSE file.
 
 //go:build !plan9
-// +build !plan9
 
 package ctxhttp
 
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -50,7 +48,7 @@ func TestNoTimeout(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer res.Body.Close()
-	slurp, err := ioutil.ReadAll(res.Body)
+	slurp, err := io.ReadAll(res.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,7 +101,7 @@ func TestCancelAfterHangingRequest(t *testing.T) {
 	done := make(chan struct{})
 
 	go func() {
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		if len(b) != 0 || err == nil {
 			t.Errorf(`Read got (%q, %v); want ("", error)`, b, err)
 		}

context/go17.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7
-// +build go1.7
 
 package context
 
@@ -32,7 +31,7 @@ var DeadlineExceeded = context.DeadlineExceeded
 // call cancel as soon as the operations running in this Context complete.
 func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
 	ctx, f := context.WithCancel(parent)
-	return ctx, CancelFunc(f)
+	return ctx, f
 }
 
 // WithDeadline returns a copy of the parent context with the deadline adjusted
@@ -46,7 +45,7 @@ func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
 // call cancel as soon as the operations running in this Context complete.
 func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
 	ctx, f := context.WithDeadline(parent, deadline)
-	return ctx, CancelFunc(f)
+	return ctx, f
 }
 
 // WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).

context/go19.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package context
 

context/pre_go17.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.7
-// +build !go1.7
 
 package context
 

context/pre_go19.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !go1.9
-// +build !go1.9
 
 package context
 

dict/dict.go

@@ -140,7 +140,7 @@ func (c *Client) Define(dict, word string) ([]*Defn, error) {
 	return def, err
 }
 
-// Fields returns the fields in s.
+// fields returns the fields in s.
 // Fields are space separated unquoted words
 // or quoted with single or double quote.
 func fields(s string) ([]string, error) {

dns/dnsmessage/example_test.go

@@ -12,41 +12,33 @@ import (
 	"golang.org/x/net/dns/dnsmessage"
 )
 
-func mustNewName(name string) dnsmessage.Name {
-	n, err := dnsmessage.NewName(name)
-	if err != nil {
-		panic(err)
-	}
-	return n
-}
-
 func ExampleParser() {
 	msg := dnsmessage.Message{
 		Header: dnsmessage.Header{Response: true, Authoritative: true},
 		Questions: []dnsmessage.Question{
 			{
-				Name:  mustNewName("foo.bar.example.com."),
+				Name:  dnsmessage.MustNewName("foo.bar.example.com."),
 				Type:  dnsmessage.TypeA,
 				Class: dnsmessage.ClassINET,
 			},
 			{
-				Name:  mustNewName("bar.example.com."),
+				Name:  dnsmessage.MustNewName("bar.example.com."),
 				Type:  dnsmessage.TypeA,
 				Class: dnsmessage.ClassINET,
 			},
 		},
 		Answers: []dnsmessage.Resource{
 			{
 				Header: dnsmessage.ResourceHeader{
-					Name:  mustNewName("foo.bar.example.com."),
+					Name:  dnsmessage.MustNewName("foo.bar.example.com."),
 					Type:  dnsmessage.TypeA,
 					Class: dnsmessage.ClassINET,
 				},
 				Body: &dnsmessage.AResource{A: [4]byte{127, 0, 0, 1}},
 			},
 			{
 				Header: dnsmessage.ResourceHeader{
-					Name:  mustNewName("bar.example.com."),
+					Name:  dnsmessage.MustNewName("bar.example.com."),
 					Type:  dnsmessage.TypeA,
 					Class: dnsmessage.ClassINET,
 				},