Update patches to apply for Go 1.25

Author: André Eriksson

patches/cover_patch.diff

@@ -6,52 +6,37 @@ Since Encore's code generation adds some extra files, this doesn't quite work.
 This patch fixes this by skipping over these files, and reading the source file
 using the overlay file system instead of directly from disk.
 
-diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
-index 7c0c104883..3cf8bb1fd3 100644
---- a/src/cmd/go/internal/load/pkg.go
-+++ b/src/cmd/go/internal/load/pkg.go
-@@ -3438,7 +3438,7 @@ func DeclareCoverVars(p *Package, files ...string) map[string]*CoverVar {
- 	sum := sha256.Sum256([]byte(p.ImportPath))
- 	h := fmt.Sprintf("%x", sum[:6])
- 	for _, file := range files {
--		if base.IsTestFile(file) {
-+		if base.IsTestFile(file) || strings.Contains(file, "encore_internal__") {
- 			continue
- 		}
- 		// For a package that is "local" (imported via ./ import or command line, outside GOPATH),
-
+diff --git a/src/cmd/go/internal/test/cover.go b/src/cmd/go/internal/test/cover.go
+index e295c2d90f..599a88731e 100644
+--- a/src/cmd/go/internal/test/cover.go
++++ b/src/cmd/go/internal/test/cover.go
+@@ -69,7 +69,7 @@ func mergeCoverProfile(file string) {
+ 		base.Errorf("test wrote malformed coverage profile %s: header %q, expected %q: %v", file, string(buf), expect, err)
+ 		return
+ 	}
+-	_, err = io.Copy(coverMerge.f, r)
++	err = copyCoverageProfile(r, coverMerge.f)
+ 	if err != nil {
+ 		base.Errorf("saving coverage profile: %v", err)
+ 		return
 diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
-index 9cf3362fbf..d309ac021c 100644
+index 63fd13f754..eeb79cd7f5 100644
 --- a/src/cmd/go/internal/work/exec.go
 +++ b/src/cmd/go/internal/work/exec.go
-@@ -627,7 +627,7 @@ OverlayLoop:
+@@ -647,7 +647,7 @@ OverlayLoop:
  		outfiles := []string{}
  		infiles := []string{}
  		for i, file := range str.StringList(gofiles, cgofiles) {
 -			if base.IsTestFile(file) {
 +			if base.IsTestFile(file) || strings.Contains(file, "encore_internal__") {
  				continue // Not covering this file.
  			}
-
-@@ -646,6 +646,7 @@ OverlayLoop:
- 				key = file
+ 
+@@ -663,6 +663,7 @@ OverlayLoop:
+ 				coverFile = objdir + file
  			}
  			coverFile = strings.TrimSuffix(coverFile, ".go") + ".cover.go"
 +			sourceFile = fsys.Actual(sourceFile)
- 			if cfg.Experiment.CoverageRedesign {
- 				infiles = append(infiles, sourceFile)
- 				outfiles = append(outfiles, coverFile)
-
-diff --git a/src/cmd/go/internal/test/cover.go b/src/cmd/go/internal/test/cover.go
-index f614458dc4..cc449e41c3 100644
---- a/src/cmd/go/internal/test/cover.go
-+++ b/src/cmd/go/internal/test/cover.go
-@@ -69,7 +69,7 @@ func mergeCoverProfile(ew io.Writer, file string) {
- 		fmt.Fprintf(ew, "error: test wrote malformed coverage profile %s.\n", file)
- 		return
- 	}
--	_, err = io.Copy(coverMerge.f, r)
-+	err = copyCoverageProfile(r, coverMerge.f)
- 	if err != nil {
- 		fmt.Fprintf(ew, "error: saving coverage profile: %v\n", err)
- 	}
+ 			infiles = append(infiles, sourceFile)
+ 			outfiles = append(outfiles, coverFile)
+ 			if i < len(gofiles) {

patches/testing_patch.diff

@@ -6,50 +6,51 @@ test runs against global state. This patch introduces a per test level callback
 test and not have state between tests interfere with each other.
 
 diff --git a/src/testing/testing.go b/src/testing/testing.go
-index 5c06aea5f8..0db6bb40ab 100644
+index 3475bfca4a..074755aef1 100644
 --- a/src/testing/testing.go
 +++ b/src/testing/testing.go
-@@ -767,6 +767,12 @@ func (c *common) frameSkip(skip int) runtime.Frame {
- // and inserts the final newline if needed and indentation spaces for formatting.
- // This function must be called with c.mu held.
- func (c *common) decorate(s string, skip int) string {
+@@ -1017,6 +1017,12 @@ func (c *common) FailNow() {
+ // indentation and the final newline if necessary. It prefixes the string
+ // with the file and line of the call site.
+ func (c *common) log(s string) {
 +	// allow encore to capture the log as well;
 +	// we do it here so that all the branches which result in a log message
-+	// during tests get captured, however we do it _before_ the liens get modified
++	// during tests get captured, however we do it _before_ the lines get modified
 +	// and indented.
-+	encoreTestLog(s, skip+1)
++	encoreTestLog(s, 3)
 +
- 	frame := c.frameSkip(skip)
- 	file := frame.File
- 	line := frame.Line
-@@ -1479,10 +1485,14 @@ func (t *T) Parallel() {
+ 	s = strings.TrimSuffix(s, "\n")
+ 
+ 	// Second and subsequent lines are indented 4 spaces. This is in addition to
+@@ -1704,11 +1710,15 @@ func (t *T) Parallel() {
  	}
  	running.Delete(t.name)
-
+ 
 +	encorePauseTest(t)
 +
  	t.signal <- true   // Release calling test.
  	<-t.parent.barrier // Wait for the parent test to complete.
- 	t.context.waitParallel()
-
+ 	t.tstate.waitParallel()
+ 	parallelStart.Add(1)
+ 
 +	encoreResumeTest(t)
 +
  	if t.chatty != nil {
  		t.chatty.Updatef(t.name, "=== CONT  %s\n", t.name)
  	}
-@@ -1538,6 +1548,7 @@ var errNilPanicOrGoexit = errors.New("test executed panic(nil) or runtime.Goexit
-
+@@ -1773,6 +1783,7 @@ var errNilPanicOrGoexit = errors.New("test executed panic(nil) or runtime.Goexit
+ 
  func tRunner(t *T, fn func(t *T)) {
  	t.runner = callerName(0)
 +	encoreStartTest(t, fn)
-
+ 
  	// When this goroutine is done, either because fn(t)
  	// returned normally or because a test failure triggered
-@@ -1545,6 +1556,7 @@ func tRunner(t *T, fn func(t *T)) {
+@@ -1780,6 +1791,7 @@ func tRunner(t *T, fn func(t *T)) {
  	// a signal saying that the test is done.
  	defer func() {
  		t.checkRaces()
 +		encoreEndTest(t)
-
+ 
  		// TODO(#61034): This is the wrong place for this check.
  		if t.Failed() {

patches/version_patch.diff

@@ -10,10 +10,10 @@ to:
     `go version go1.21.0-encore darwin/arm64`
 
 diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
-index 8973a87168..8fd7b01a15 100644
+index 024050c2dd..01be354b3d 100644
 --- a/src/cmd/dist/build.go
 +++ b/src/cmd/dist/build.go
-@@ -393,7 +393,8 @@ func findgoversion() string {
+@@ -406,7 +406,8 @@ func findgoversion() string {
  		// its content if available, which is empty at this point.
  		// Only use the VERSION file if it is non-empty.
  		if b != "" {
@@ -22,13 +22,13 @@ index 8973a87168..8fd7b01a15 100644
 +			return strings.TrimSuffix(b, "-encore") + "-encore"
  		}
  	}
-
-@@ -424,7 +425,7 @@ func findgoversion() string {
+ 
+@@ -441,7 +442,7 @@ func findgoversion() string {
  	if m == nil {
  		fatalf("internal/goversion/goversion.go does not contain 'const Version = ...'")
  	}
--	version := fmt.Sprintf("devel go1.%s-", m[1])
-+	version := fmt.Sprintf("devel go1.%s-encore-", m[1])
+-	version := fmt.Sprintf("go1.%s-devel_", m[1])
++	version := fmt.Sprintf("go1.%s-devel-encore_", m[1])
  	version += chomp(run(goroot, CheckExit, "git", "log", "-n", "1", "--format=format:%h %cd", "HEAD"))
-
+ 
  	// Cache version.