Merge a4bc4a5dc5 into 8552bcf7c2

src/crypto/cipher/gcm.go

@@ -82,7 +82,7 @@ func newGCM(cipher Block, nonceSize, tagSize int) (AEAD, error) {
 
 // NewGCMWithRandomNonce returns the given cipher wrapped in Galois Counter
 // Mode, with randomly-generated nonces. The cipher must have been created by
-// [crypto/aes.NewCipher].
+// [aes.NewCipher].
 //
 // It generates a random 96-bit nonce, which is prepended to the ciphertext by Seal,
 // and is extracted from the ciphertext by Open. The NonceSize of the AEAD is zero,

src/go/doc/testdata/issue62640.0.golden

@@ -1,22 +0,0 @@
-// 
-PACKAGE issue62640
-
-IMPORTPATH
-	testdata/issue62640
-
-FILENAMES
-	testdata/issue62640.go
-
-TYPES
-	// 
-	type E struct{}
-
-	// F should be hidden within S because of the S.F field. 
-	func (E) F()
-
-	// 
-	type S struct {
-		E
-		F	int
-	}
-

src/go/doc/testdata/issue62640.1.golden

@@ -1,22 +0,0 @@
-// 
-PACKAGE issue62640
-
-IMPORTPATH
-	testdata/issue62640
-
-FILENAMES
-	testdata/issue62640.go
-
-TYPES
-	// 
-	type E struct{}
-
-	// F should be hidden within S because of the S.F field. 
-	func (E) F()
-
-	// 
-	type S struct {
-		E
-		F	int
-	}
-

src/go/doc/testdata/issue62640.2.golden

@@ -1,25 +0,0 @@
-// 
-PACKAGE issue62640
-
-IMPORTPATH
-	testdata/issue62640
-
-FILENAMES
-	testdata/issue62640.go
-
-TYPES
-	// 
-	type E struct{}
-
-	// F should be hidden within S because of the S.F field. 
-	func (E) F()
-
-	// 
-	type S struct {
-		E
-		F	int
-	}
-
-	// F should be hidden within S because of the S.F field. 
-	func (S) F()
-

src/go/doc/testdata/issue62640.go

@@ -1,15 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package issue62640
-
-type E struct{}
-
-// F should be hidden within S because of the S.F field.
-func (E) F() {}
-
-type S struct {
-	E
-	F int
-}

src/runtime/mheap.go

@@ -312,10 +312,8 @@ type heapArena struct {
 	// during marking.
 	pageSpecials [pagesPerArena / 8]uint8
 
-	// pageUseSpanInlineMarkBits is a bitmap where each bit corresponds
-	// to a span, as only spans one page in size can have inline mark bits.
-	// The bit indicates that the span has a spanInlineMarkBits struct
-	// stored directly at the top end of the span's memory.
+	// pageUseSpanDartboard is a bitmap that indicates which spans are
+	// heap spans and also gcUsesSpanDartboard.
 	pageUseSpanInlineMarkBits [pagesPerArena / 8]uint8
 
 	// checkmarks stores the debug.gccheckmark state. It is only

src/testing/synctest/helper_test.go

@@ -1,15 +0,0 @@
-// Copyright 2025 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package synctest_test
-
-import "testing"
-
-// helperLog is a t.Helper which logs.
-// Since it is a helper, the log prefix should contain
-// the caller's file, not helper_test.go.
-func helperLog(t *testing.T, s string) {
-	t.Helper()
-	t.Log(s)
-}

src/testing/synctest/synctest_test.go

@@ -140,18 +140,6 @@ func TestRun(t *testing.T) {
 	})
 }
 
-func TestHelper(t *testing.T) {
-	runTest(t, []string{"-test.v"}, func() {
-		synctest.Test(t, func(t *testing.T) {
-			helperLog(t, "log in helper")
-		})
-	}, `^=== RUN   TestHelper
-    synctest_test.go:.* log in helper
---- PASS: TestHelper.*
-PASS
-$`)
-}
-
 func wantPanic(t *testing.T, want string) {
 	if e := recover(); e != nil {
 		if got := fmt.Sprint(e); got != want {

src/testing/testing.go

@@ -1261,9 +1261,6 @@ func (c *common) Skipped() bool {
 // When printing file and line information, that function will be skipped.
 // Helper may be called simultaneously from multiple goroutines.
 func (c *common) Helper() {
-	if c.isSynctest {
-		c = c.parent
-	}
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	if c.helperPCs == nil {