Add basic 1.25 support #83

Author: stevemk14ebr

build_test_files.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 trap "exit" INT
 sudo rm -rf $(pwd)/test/build
-versions=("1.24" "1.23" "1.22" "1.21" "1.20" "1.19" "1.18" "1.17" "1.16" "1.15" "1.14" "1.13" "1.12" "1.11" "1.10" "1.9" "1.8" "1.7" "1.6" "1.5")
+versions=("1.25" "1.24" "1.23" "1.22" "1.21" "1.20" "1.19" "1.18" "1.17" "1.16" "1.15" "1.14" "1.13" "1.12" "1.11" "1.10" "1.9" "1.8" "1.7" "1.6" "1.5")
 for v in "${versions[@]}"
 do
     GO_TAG=$v

debug/gosym/pclntab.go

@@ -264,7 +264,8 @@ func (t *LineTable) parsePclnTab(versionOverride string) {
 	t.Version = possibleVersion
 
 	if len(versionOverride) > 0 {
-		if strings.Contains(versionOverride, "1.24") ||
+		if strings.Contains(versionOverride, "1.25") ||
+			strings.Contains(versionOverride, "1.24") ||
 			strings.Contains(versionOverride, "1.23") ||
 			strings.Contains(versionOverride, "1.22") ||
 			strings.Contains(versionOverride, "1.21") {

main_test.go

@@ -11,7 +11,7 @@ import (
 	_ "net/http/pprof"
 )
 
-var versions = []string{"124", "123", "122", "121", "120", "119", "118", "117", "116", "115", "114", "113", "112", "111", "110", "19", "18", "17", "16", "15"}
+var versions = []string{"125", "124", "123", "122", "121", "120", "119", "118", "117", "116", "115", "114", "113", "112", "111", "110", "19", "18", "17", "16", "15"}
 var fileNames = []string{"testproject_lin", "testproject_lin_32", "testproject_lin_stripped", "testproject_lin_stripped_32", "testproject_mac", "testproject_mac_stripped", "testproject_win_32.exe", "testproject_win_stripped_32.exe", "testproject_win_stripped.exe", "testproject_win.exe"}
 
 func TestAllVersions(t *testing.T) {

objfile/layouts.go

@@ -137,7 +137,7 @@ func getModuleDataLayout(version string) *ModuleDataLayout {
 	// Map version to layout name (many versions share layouts)
 	layoutName := version
 	switch version {
-	case "1.24", "1.23", "1.22", "1.21":
+	case "1.25", "1.24", "1.23", "1.22", "1.21":
 		layoutName = "1.21"
 	case "1.20":
 		layoutName = "1.20"
@@ -713,7 +713,7 @@ func getRtypeLayout(runtimeVersion string) *RtypeLayout {
 		layoutName = "1.7"
 	case "1.14", "1.15", "1.16", "1.17", "1.18", "1.19":
 		layoutName = "1.14"
-	case "1.20", "1.21", "1.22", "1.23", "1.24":
+	case "1.20", "1.21", "1.22", "1.23", "1.24", "1.25":
 		layoutName = "1.20"
 	default:
 		return nil
@@ -923,7 +923,7 @@ func getInterfaceLayout(version string) *InterfaceLayout {
 			MethodsFormat:     IFMethodsPre17,
 		}
 	case "1.7", "1.8", "1.9", "1.10", "1.11", "1.12", "1.13", "1.14",
-		"1.15", "1.16", "1.17", "1.18", "1.19", "1.20", "1.21", "1.22", "1.23", "1.24":
+		"1.15", "1.16", "1.17", "1.18", "1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25":
 		return &InterfaceLayout{
 			MethodsOffsetPtrs: 1, // pkgPath at +0, methods slice at +1
 			PkgPathOffsetPtrs: 0,

objfile/layouts_test.go

@@ -243,6 +243,7 @@ func TestVersionMapping(t *testing.T) {
 		{"1.22", "1.21"}, // 1.22 uses same layout as 1.21
 		{"1.23", "1.21"}, // 1.23 uses same layout as 1.21
 		{"1.24", "1.21"}, // 1.24 uses same layout as 1.21
+		{"1.25", "1.21"}, // 1.25 uses same layout as 1.21
 		{"1.20", "1.20"},
 		{"1.18", "1.18"},
 		{"1.19", "1.18"}, // 1.19 uses same layout as 1.18

objfile/objfile.go

@@ -288,6 +288,8 @@ func (e *Entry) ModuleDataTable(pclntabVA uint64, runtimeVersion string, version
 		// with some higher versions using the same layout as versions before it.
 		switch version {
 		// Refactored: Go 1.16-1.24 use generic parser with layout tables
+		case "1.25":
+			fallthrough
 		case "1.24":
 			fallthrough
 		case "1.23":
@@ -544,6 +546,8 @@ func (e *Entry) readRTypeName(runtimeVersion string, typeFlags tflag, namePtr ui
 	case "1.23":
 		fallthrough
 	case "1.24":
+		fallthrough
+	case "1.25":
 		varint_len, namelen, err := e.readVarint(namePtr + 1)
 		if err != nil {
 			return "", fmt.Errorf("Failed to read name")
@@ -1006,6 +1010,8 @@ func (e *Entry) ParseType_impl(runtimeVersion string, moduleData *ModuleData, ty
 		case "1.23":
 			fallthrough
 		case "1.24":
+			fallthrough
+		case "1.25":
 			var methodsStartAddr uint64 = typeAddress + uint64(_type.baseSize) + ptrSize
 			var methods GoSlice64 = GoSlice64{}
 			if is64bit {
@@ -1175,6 +1181,8 @@ func (e *Entry) ParseType_impl(runtimeVersion string, moduleData *ModuleData, ty
 		case "1.23":
 			fallthrough
 		case "1.24":
+			fallthrough
+		case "1.25":
 			// type structType struct {
 			// 	rtype
 			// 	pkgPath name // pointer