Merge branch 'golang:master' into master

Author: kevin-valerio

src/cmd/go/internal/imports/read_test.go

@@ -146,7 +146,7 @@ func testRead(t *testing.T, tests []readTest, read func(io.Reader) ([]byte, erro
 			}
 			continue
 		}
-		if err == nil && tt.err != "" {
+		if tt.err != "" {
 			t.Errorf("#%d: success, expected %q", i, tt.err)
 			continue
 		}

src/cmd/go/internal/load/godebug.go

@@ -66,10 +66,7 @@ func defaultGODEBUG(loaderstate *modload.State, p *Package, directives, testDire
 	// If GOFIPS140 is set to anything but "off",
 	// default to GODEBUG=fips140=on.
 	if fips140.Enabled() {
-		if m == nil {
-			m = make(map[string]string)
-		}
-		m["fips140"] = "on"
+		m = map[string]string{"fips140": "on"}
 	}
 
 	// Add directives from main module go.mod.

src/cmd/internal/script/engine.go

@@ -580,23 +580,21 @@ func (e *Engine) runCommand(s *State, cmd *command, impl Cmd) error {
 		return nil
 	}
 
-	if wait != nil {
-		stdout, stderr, waitErr := wait(s)
-		s.stdout = stdout
-		s.stderr = stderr
-		if stdout != "" {
-			s.Logf("[stdout]\n%s", stdout)
-		}
-		if stderr != "" {
-			s.Logf("[stderr]\n%s", stderr)
-		}
-		if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil {
-			return cmdErr
-		}
-		if waitErr != nil {
-			// waitErr was expected (by cmd.want), so log it instead of returning it.
-			s.Logf("[%v]\n", waitErr)
-		}
+	stdout, stderr, waitErr := wait(s)
+	s.stdout = stdout
+	s.stderr = stderr
+	if stdout != "" {
+		s.Logf("[stdout]\n%s", stdout)
+	}
+	if stderr != "" {
+		s.Logf("[stderr]\n%s", stderr)
+	}
+	if cmdErr := checkStatus(cmd, waitErr); cmdErr != nil {
+		return cmdErr
+	}
+	if waitErr != nil {
+		// waitErr was expected (by cmd.want), so log it instead of returning it.
+		s.Logf("[%v]\n", waitErr)
 	}
 	return nil
 }

src/cmd/link/internal/ld/elf.go

@@ -178,14 +178,7 @@ func Elfinit(ctxt *Link) {
 
 	switch ctxt.Arch.Family {
 	// 64-bit architectures
-	case sys.PPC64, sys.S390X:
-		if ctxt.Arch.ByteOrder == binary.BigEndian && ctxt.HeadType != objabi.Hopenbsd {
-			ehdr.Flags = 1 // Version 1 ABI
-		} else {
-			ehdr.Flags = 2 // Version 2 ABI
-		}
-		fallthrough
-	case sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS64, sys.RISCV64:
+	case sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X:
 		if ctxt.Arch.Family == sys.MIPS64 {
 			ehdr.Flags = 0x20000004 // MIPS 3 CPIC
 		}
@@ -195,6 +188,12 @@ func Elfinit(ctxt *Link) {
 		if ctxt.Arch.Family == sys.RISCV64 {
 			ehdr.Flags = 0x4 // RISCV Float ABI Double
 		}
+		if ctxt.Arch.Family == sys.S390X {
+			ehdr.Flags = 1 // Version 1 ABI
+		}
+		if ctxt.Arch.Family == sys.PPC64 {
+			ehdr.Flags = 2 // Version 2 ABI
+		}
 		elf64 = true
 
 		ehdr.Phoff = ELF64HDRSIZE      // Must be ELF64HDRSIZE: first PHdr must follow ELF header

src/crypto/mlkem/mlkem_test.go

@@ -274,9 +274,6 @@ func BenchmarkRoundTrip(b *testing.B) {
 	ek := dk.EncapsulationKey()
 	ekBytes := ek.Bytes()
 	_, c := ek.Encapsulate()
-	if err != nil {
-		b.Fatal(err)
-	}
 	b.Run("Alice", func(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			dkS, err := GenerateKey768()
@@ -300,9 +297,6 @@ func BenchmarkRoundTrip(b *testing.B) {
 				b.Fatal(err)
 			}
 			Ks, cS := ek.Encapsulate()
-			if err != nil {
-				b.Fatal(err)
-			}
 			sink ^= cS[0] ^ Ks[0]
 		}
 	})

src/crypto/x509/root_unix_test.go

@@ -30,9 +30,7 @@ func TestEnvVars(t *testing.T) {
 		t.Fatalf("failed to read test cert: %s", err)
 	}
 	if err := os.WriteFile(filepath.Join(tmpDir, testFile), testCert, 0644); err != nil {
-		if err != nil {
-			t.Fatalf("failed to write test cert: %s", err)
-		}
+		t.Fatalf("failed to write test cert: %s", err)
 	}
 
 	testCases := []struct {

src/encoding/ascii85/ascii85_test.go

@@ -119,13 +119,10 @@ func TestDecoder(t *testing.T) {
 		decoder := NewDecoder(strings.NewReader(p.encoded))
 		dbuf, err := io.ReadAll(decoder)
 		if err != nil {
-			t.Fatal("Read failed", err)
+			t.Fatalf("Read from %q = %v, want nil", p.encoded, err)
 		}
 		testEqual(t, "Read from %q = length %v, want %v", p.encoded, len(dbuf), len(p.decoded))
 		testEqual(t, "Decoding of %q = %q, want %q", p.encoded, string(dbuf), p.decoded)
-		if err != nil {
-			testEqual(t, "Read from %q = %v, want %v", p.encoded, err, io.EOF)
-		}
 	}
 }