gocore: update for Go1.17

jordanlewis · jordanlewis · commit 2f74ebfbc601 · 2021-11-19T17:58:03.000-04:00
diff --git a/internal/gocore/gocore_test.go b/internal/gocore/gocore_test.go
@@ -274,4 +274,5 @@ func TestVersions(t *testing.T) {
 	loadExampleVersion(t, "1.13.3.zip")
 	loadExampleVersion(t, "1.14.zip")
 	loadExampleVersion(t, "1.16.zip")
+	loadExampleVersion(t, "1.17.zip")
 }
diff --git a/internal/gocore/process.go b/internal/gocore/process.go
@@ -333,7 +333,10 @@ func (p *Process) readSpans(mheap region, arenas []arena) {
 			panic("weird mapping " + m.Perm().String())
 		}
 	}
-	if mheap.HasField("curArena") { // go1.13.3 and up
+	if p.minorVersion < 17 && mheap.HasField("curArena") {
+		// go1.13.3 and up has curArena.
+		// In Go 1.17, we ... don't need to do this any longer. See patch
+		// bd6aeca9686d5e672ffda1ea0cfeac7a3e7a20a4
 		// Subtract from the heap unallocated space
 		// in the current arena.
 		ca := mheap.Field("curArena")
diff --git a/internal/gocore/testdata/1.17.zip b/internal/gocore/testdata/1.17.zip

Original file line number	Diff line number	Diff line change
`@@ -274,4 +274,5 @@ func TestVersions(t *testing.T) {`
`274`	`274`	`loadExampleVersion(t, "1.13.3.zip")`
`275`	`275`	`loadExampleVersion(t, "1.14.zip")`
`276`	`276`	`loadExampleVersion(t, "1.16.zip")`
	`277`	`+ loadExampleVersion(t, "1.17.zip")`
`277`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,10 @@ func (p *Process) readSpans(mheap region, arenas []arena) {`
`333`	`333`	`panic("weird mapping " + m.Perm().String())`
`334`	`334`	`}`
`335`	`335`	`}`
`336`		`- if mheap.HasField("curArena") { // go1.13.3 and up`
	`336`	`+ if p.minorVersion < 17 && mheap.HasField("curArena") {`
	`337`	`+ // go1.13.3 and up has curArena.`
	`338`	`+ // In Go 1.17, we ... don't need to do this any longer. See patch`
	`339`	`+ // bd6aeca9686d5e672ffda1ea0cfeac7a3e7a20a4`
`337`	`340`	`// Subtract from the heap unallocated space`
`338`	`341`	`// in the current arena.`
`339`	`342`	`ca := mheap.Field("curArena")`