Merge pull request #19 from golang/master

[pull] master from golang:master

Author: pull[bot]

src/cmd/go/internal/cache/prog.go

@@ -204,6 +204,7 @@ func (c *ProgCache) send(ctx context.Context, req *cacheprog.Request) (*cachepro
 func (c *ProgCache) writeToChild(req *cacheprog.Request, resc chan<- *cacheprog.Response) (err error) {
 	c.mu.Lock()
 	if c.inFlight == nil {
+		c.mu.Unlock()
 		return errCacheprogClosed
 	}
 	c.nextID++

src/cmd/go/internal/modfetch/cache.go

@@ -781,7 +781,7 @@ func rewriteVersionList(ctx context.Context, dir string) (err error) {
 	}
 	if fi, err := f.Stat(); err == nil && int(fi.Size()) == buf.Len() {
 		old := make([]byte, buf.Len()+1)
-		if n, err := f.ReadAt(old, 0); err == io.EOF && n == buf.Len() && bytes.Equal(buf.Bytes(), old) {
+		if n, err := f.ReadAt(old, 0); err == io.EOF && n == buf.Len() && bytes.Equal(buf.Bytes(), old[:n]) {
 			return nil // No edit needed.
 		}
 	}

src/html/template/transition.go

@@ -426,7 +426,7 @@ func tJSDelimited(c context, s []byte) (context, int) {
 			// If "</script" appears in a regex literal, the '/' should not
 			// close the regex literal, and it will later be escaped to
 			// "\x3C/script" in escapeText.
-			if i > 0 && i+7 <= len(s) && bytes.Equal(bytes.ToLower(s[i-1:i+7]), []byte("</script")) {
+			if i > 0 && i+7 <= len(s) && bytes.EqualFold(s[i-1:i+7], []byte("</script")) {
 				i++
 			} else if !inCharset {
 				c.state, c.jsCtx = stateJS, jsCtxDivOp

src/internal/goexperiment/exp_goroutineleakprofile_off.go

@@ -77,7 +77,6 @@ import (
 	"fmt"
 	"html"
 	"internal/godebug"
-	"internal/goexperiment"
 	"internal/profile"
 	"io"
 	"log"
@@ -362,22 +361,17 @@ var profileSupportsDelta = map[handler]bool{
 }
 
 var profileDescriptions = map[string]string{
-	"allocs":       "A sampling of all past memory allocations",
-	"block":        "Stack traces that led to blocking on synchronization primitives",
-	"cmdline":      "The command line invocation of the current program",
-	"goroutine":    "Stack traces of all current goroutines. Use debug=2 as a query parameter to export in the same format as an unrecovered panic.",
-	"heap":         "A sampling of memory allocations of live objects. You can specify the gc GET parameter to run GC before taking the heap sample.",
-	"mutex":        "Stack traces of holders of contended mutexes",
-	"profile":      "CPU profile. You can specify the duration in the seconds GET parameter. After you get the profile file, use the go tool pprof command to investigate the profile.",
-	"symbol":       "Maps given program counters to function names. Counters can be specified in a GET raw query or POST body, multiple counters are separated by '+'.",
-	"threadcreate": "Stack traces that led to the creation of new OS threads",
-	"trace":        "A trace of execution of the current program. You can specify the duration in the seconds GET parameter. After you get the trace file, use the go tool trace command to investigate the trace.",
-}
-
-func init() {
-	if goexperiment.GoroutineLeakProfile {
-		profileDescriptions["goroutineleak"] = "Stack traces of all leaked goroutines. Use debug=2 as a query parameter to export in the same format as an unrecovered panic."
-	}
+	"allocs":        "A sampling of all past memory allocations",
+	"block":         "Stack traces that led to blocking on synchronization primitives",
+	"cmdline":       "The command line invocation of the current program",
+	"goroutine":     "Stack traces of all current goroutines. Use debug=2 as a query parameter to export in the same format as an unrecovered panic.",
+	"heap":          "A sampling of memory allocations of live objects. You can specify the gc GET parameter to run GC before taking the heap sample.",
+	"mutex":         "Stack traces of holders of contended mutexes",
+	"profile":       "CPU profile. You can specify the duration in the seconds GET parameter. After you get the profile file, use the go tool pprof command to investigate the profile.",
+	"symbol":        "Maps given program counters to function names. Counters can be specified in a GET raw query or POST body, multiple counters are separated by '+'.",
+	"threadcreate":  "Stack traces that led to the creation of new OS threads",
+	"trace":         "A trace of execution of the current program. You can specify the duration in the seconds GET parameter. After you get the trace file, use the go tool trace command to investigate the trace.",
+	"goroutineleak": "Stack traces of all leaked goroutines. Use debug=2 as a query parameter to export in the same format as an unrecovered panic.",
 }
 
 type profileEntry struct {

src/internal/goexperiment/exp_goroutineleakprofile_on.go

@@ -194,21 +194,6 @@ func buildTestProg(t *testing.T, binary string, flags ...string) (string, error)
 		cmd.Dir = "testdata/" + binary
 		cmd = testenv.CleanCmdEnv(cmd)
 
-		// If tests need any experimental flags, add them here.
-		//
-		// TODO(vsaioc): Remove `goroutineleakprofile` once the feature is no longer experimental.
-		edited := false
-		for i := range cmd.Env {
-			e := cmd.Env[i]
-			if _, vars, ok := strings.Cut(e, "GOEXPERIMENT="); ok {
-				cmd.Env[i] = "GOEXPERIMENT=" + vars + ",goroutineleakprofile"
-				edited, _ = true, vars
-			}
-		}
-		if !edited {
-			cmd.Env = append(cmd.Env, "GOEXPERIMENT=goroutineleakprofile")
-		}
-
 		out, err := cmd.CombinedOutput()
 		if err != nil {
 			target.err = fmt.Errorf("building %s %v: %v\n%s", binary, flags, err, out)

src/net/http/pprof/pprof.go

@@ -509,7 +509,6 @@ func TestGoroutineLeakProfile(t *testing.T) {
 
 				cmdEnv := []string{
 					"GODEBUG=asyncpreemptoff=1",
-					"GOEXPERIMENT=goroutineleakprofile",
 				}
 
 				if tcase.simple {

src/runtime/crash_test.go

@@ -80,7 +80,6 @@ import (
 	"cmp"
 	"fmt"
 	"internal/abi"
-	"internal/goexperiment"
 	"internal/profilerecord"
 	"io"
 	"runtime"
@@ -257,15 +256,13 @@ func lockProfiles() {
 	if profiles.m == nil {
 		// Initial built-in profiles.
 		profiles.m = map[string]*Profile{
-			"goroutine":    goroutineProfile,
-			"threadcreate": threadcreateProfile,
-			"heap":         heapProfile,
-			"allocs":       allocsProfile,
-			"block":        blockProfile,
-			"mutex":        mutexProfile,
-		}
-		if goexperiment.GoroutineLeakProfile {
-			profiles.m["goroutineleak"] = goroutineLeakProfile
+			"goroutine":     goroutineProfile,
+			"threadcreate":  threadcreateProfile,
+			"heap":          heapProfile,
+			"allocs":        allocsProfile,
+			"block":         blockProfile,
+			"mutex":         mutexProfile,
+			"goroutineleak": goroutineLeakProfile,
 		}
 	}
 }