[release-branch.go1.26] all: merge master (2baa1d1) into release-branch.go1.26

For #76474.

Change-Id: Ic50e288f99b731b62af9aa73ce6721f0f2f3596d

5 files changed, 32 insertions, 38 deletions

diff --git a/src/runtime/_mkmalloc/mkmalloc.go b/src/runtime/_mkmalloc/mkmalloc.go
index 434eaad767..450608a7a4 100644
--- a/src/runtime/_mkmalloc/mkmalloc.go
+++ b/src/runtime/_mkmalloc/mkmalloc.go
@@ -130,7 +130,7 @@ func tinyFuncName(size uintptr) string {
 	if size == 0 || size > smallScanNoHeaderMax {
 		return "mallocPanic"
 	}
-	return fmt.Sprintf("mallocTiny%d", size)
+	return fmt.Sprintf("mallocgcTinySize%d", size)
 }
 
 func smallNoScanSCFuncName(sc, scMax uint8) string {
diff --git a/src/runtime/malloc_generated.go b/src/runtime/malloc_generated.go
index 2be6a5b6f5..8d7112646f 100644
--- a/src/runtime/malloc_generated.go
+++ b/src/runtime/malloc_generated.go
@@ -4300,7 +4300,7 @@ func mallocgcSmallScanNoHeaderSC26(size uintptr, typ *_type, needzero bool) unsa
 	return x
 }
 
-func mallocTiny1(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize1(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -4456,7 +4456,7 @@ func mallocTiny1(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny2(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize2(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -4612,7 +4612,7 @@ func mallocTiny2(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny3(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize3(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -4768,7 +4768,7 @@ func mallocTiny3(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny4(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize4(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -4924,7 +4924,7 @@ func mallocTiny4(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny5(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize5(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5080,7 +5080,7 @@ func mallocTiny5(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny6(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize6(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5236,7 +5236,7 @@ func mallocTiny6(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny7(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize7(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5392,7 +5392,7 @@ func mallocTiny7(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny8(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize8(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5548,7 +5548,7 @@ func mallocTiny8(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny9(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize9(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5704,7 +5704,7 @@ func mallocTiny9(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny10(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize10(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -5860,7 +5860,7 @@ func mallocTiny10(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny11(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize11(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -6016,7 +6016,7 @@ func mallocTiny11(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny12(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize12(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -6172,7 +6172,7 @@ func mallocTiny12(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny13(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize13(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -6328,7 +6328,7 @@ func mallocTiny13(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny14(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize14(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
@@ -6484,7 +6484,7 @@ func mallocTiny14(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 	return x
 }
 
-func mallocTiny15(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
+func mallocgcTinySize15(size uintptr, typ *_type, needzero bool) unsafe.Pointer {
 
 	gp := getg()
 	if goexperiment.RuntimeSecret && gp.secret > 0 {
diff --git a/src/runtime/malloc_tables_generated.go b/src/runtime/malloc_tables_generated.go
index 36650881fe..b1ddde2aad 100644
--- a/src/runtime/malloc_tables_generated.go
+++ b/src/runtime/malloc_tables_generated.go
@@ -523,21 +523,21 @@ var mallocScanTable = [513]func(size uintptr, typ *_type, needzero bool) unsafe.
 
 var mallocNoScanTable = [513]func(size uintptr, typ *_type, needzero bool) unsafe.Pointer{
 	mallocPanic,
-	mallocTiny1,
-	mallocTiny2,
-	mallocTiny3,
-	mallocTiny4,
-	mallocTiny5,
-	mallocTiny6,
-	mallocTiny7,
-	mallocTiny8,
-	mallocTiny9,
-	mallocTiny10,
-	mallocTiny11,
-	mallocTiny12,
-	mallocTiny13,
-	mallocTiny14,
-	mallocTiny15,
+	mallocgcTinySize1,
+	mallocgcTinySize2,
+	mallocgcTinySize3,
+	mallocgcTinySize4,
+	mallocgcTinySize5,
+	mallocgcTinySize6,
+	mallocgcTinySize7,
+	mallocgcTinySize8,
+	mallocgcTinySize9,
+	mallocgcTinySize10,
+	mallocgcTinySize11,
+	mallocgcTinySize12,
+	mallocgcTinySize13,
+	mallocgcTinySize14,
+	mallocgcTinySize15,
 	mallocgcSmallNoScanSC2,
 	mallocgcSmallNoScanSC3,
 	mallocgcSmallNoScanSC3,
diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go
index 68dfca4668..9b62ee4273 100644
--- a/src/runtime/mheap.go
+++ b/src/runtime/mheap.go
@@ -457,12 +457,6 @@ type mspan struct {
 	// mallocgc, and issue 54596).
 	freeIndexForScan uint16
 
-	// Temporary storage for the object index that caused this span to
-	// be queued for scanning.
-	//
-	// Used only with goexperiment.GreenTeaGC.
-	scanIdx uint16
-
 	// Cache of the allocBits at freeindex. allocCache is shifted
 	// such that the lowest bit corresponds to the bit freeindex.
 	// allocCache holds the complement of allocBits, thus allowing
diff --git a/src/runtime/trace/recorder.go b/src/runtime/trace/recorder.go
index a18d764141..8617231aaa 100644
--- a/src/runtime/trace/recorder.go
+++ b/src/runtime/trace/recorder.go
@@ -112,7 +112,7 @@ func runtime_traceClockNow() uint64
 // frequency is nanoseconds per timestamp unit.
 type frequency float64
 
-// mul multiplies an unprocessed to produce a time in nanoseconds.
+// mul multiplies an unprocessed timestamp to produce a time in nanoseconds.
 func (f frequency) mul(t timestamp) eventTime {
 	return eventTime(float64(t) * float64(f))
 }