feat: support path handle on multi platform

.github/workflows/go.yml

@@ -1,4 +1,4 @@
-name: build
+name: Build and tests
 
 on:
   push:
@@ -7,23 +7,26 @@ on:
     branches: [ develop, master ]
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
+  build_and_tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ">=1.21.0"
 
     - name: Build
       run: go build -o a
 
     - name: Test
+      shell: bash
       run: go test -timeout 1800s -v -race -coverprofile=coverage.txt -covermode=atomic -tags slow_test
 
     - name: Codecov

file.go

@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
+	"path"
 	"sort"
 	"sync"
 )
@@ -237,7 +237,7 @@ func (f *GoFile) enumPackages() error {
 		p, ok := packages[n.PackageName()]
 		if !ok {
 			p = &Package{
-				Filepath:  filepath.Dir(n.BaseName()),
+				Filepath:  "", // to be filled later by dir(PCToLine())
 				Functions: make([]*Function, 0),
 				Methods:   make([]*Method, 0),
 			}
@@ -258,11 +258,6 @@ func (f *GoFile) enumPackages() error {
 			}
 
 			p.Methods = append(p.Methods, m)
-
-			if !ok && needFilepath {
-				fp, _, _ := tab.PCToLine(m.Offset)
-				p.Filepath = filepath.Dir(fp)
-			}
 		} else {
 			f := &Function{
 				Name:        n.BaseName(),
@@ -271,10 +266,15 @@ func (f *GoFile) enumPackages() error {
 				PackageName: n.PackageName(),
 			}
 			p.Functions = append(p.Functions, f)
+		}
 
-			if !ok && needFilepath {
-				fp, _, _ := tab.PCToLine(f.Offset)
-				p.Filepath = filepath.Dir(fp)
+		if needFilepath {
+			fp, _, _ := tab.PCToLine(n.Entry)
+			switch fp {
+			case "<autogenerated>", "":
+				p.Filepath = fp
+			default:
+				p.Filepath = path.Dir(fp)
 			}
 		}
 	}

goroot.go

@@ -19,6 +19,7 @@ package gore
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -28,7 +29,7 @@ import (
 )
 
 func tryFromGOROOT(f *GoFile) (string, error) {
-	// Check for non supported architectures.
+	// Check for non-supported architectures.
 	if f.FileInfo.Arch != Arch386 && f.FileInfo.Arch != ArchAMD64 {
 		return "", nil
 	}
@@ -59,9 +60,9 @@ pkgLoop:
 		}
 	}
 
-	// Check if the functions was found
+	// Check if the functions were found
 	if fcn == nil {
-		// If we can't find the function there is nothing to do.
+		// If we can't find the function, there is nothing to do.
 		return "", ErrNoGoRootFound
 	}
 	// Get the raw hex.
@@ -92,13 +93,13 @@ pkgLoop:
 		}
 		arg := inst.Args[1].(x86asm.Mem)
 
-		// First assume that the address is a direct addressing.
+		// First, assume that the address is a direct addressing.
 		addr := arg.Disp
 		if arg.Base == x86asm.EIP || arg.Base == x86asm.RIP {
 			// If the addressing is based on the instruction pointer, fix the address.
 			addr = addr + int64(fcn.Offset) + int64(s)
 		} else if arg.Base == 0 && arg.Disp > 0 {
-			// In order to support x32 direct addressing
+			// To support x32 direct addressing
 		} else {
 			continue
 		}
@@ -182,7 +183,7 @@ pkgLoop:
 					}
 					addr = addr + fcn.Offset + uint64(s)
 				} else if arg.Base == 0 && arg.Disp > 0 {
-					// In order to support x32 direct addressing
+					// To support x32 direct addressing
 				} else {
 					continue
 				}
@@ -208,7 +209,7 @@ pkgLoop:
 }
 
 func tryFromTimeInit(f *GoFile) (string, error) {
-	// Check for non supported architectures.
+	// Check for non-supported architectures.
 	if f.FileInfo.Arch != Arch386 && f.FileInfo.Arch != ArchAMD64 {
 		return "", nil
 	}
@@ -239,7 +240,7 @@ pkgLoop:
 		}
 	}
 
-	// Check if the functions was found
+	// Check if the functions were found
 	if fcn == nil {
 		// If we can't find the function there is nothing to do.
 		return "", ErrNoGoRootFound
@@ -276,13 +277,13 @@ pkgLoop:
 		}
 		arg := inst.Args[1].(x86asm.Mem)
 
-		// First assume that the address is a direct addressing.
+		// First, assume that the address is a direct addressing.
 		addr := arg.Disp
 		if arg.Base == x86asm.EIP || arg.Base == x86asm.RIP {
 			// If the addressing is based on the instruction pointer, fix the address.
 			addr = addr + int64(fcn.Offset) + int64(s)
 		} else if arg.Base == 0 && arg.Disp > 0 {
-			// In order to support x32 direct addressing
+			// To support x32 direct addressing
 		} else {
 			continue
 		}
@@ -332,19 +333,19 @@ func findGoRootPath(f *GoFile) (string, error) {
 	if goroot != "" {
 		return goroot, nil
 	}
-	if err != nil && err != ErrNoGoRootFound {
+	if err != nil && !errors.Is(err, ErrNoGoRootFound) {
 		return "", err
 	}
 
 	goroot, err = tryFromTimeInit(f)
 	if goroot != "" {
 		return goroot, nil
 	}
-	if err != nil && err != ErrNoGoRootFound {
+	if err != nil && !errors.Is(err, ErrNoGoRootFound) {
 		return "", err
 	}
 
-	// Try determine from std lib package paths.
+	// Try to determine from std lib package paths.
 	pkg, err := f.GetSTDLib()
 	if err != nil {
 		return "", fmt.Errorf("error when getting standard library packages: %w", err)
@@ -358,6 +359,10 @@ func findGoRootPath(f *GoFile) (string, error) {
 		if strings.HasSuffix(v.Filepath, subpath) {
 			return strings.TrimSuffix(v.Filepath, subpath), nil
 		}
+		subpathWin := fmt.Sprintf("\\src\\%s", v.Name)
+		if strings.HasSuffix(v.Filepath, subpathWin) {
+			return strings.TrimSuffix(v.Filepath, subpathWin), nil
+		}
 	}
 
 	return "", ErrNoGoRootFound

goroot_test.go

@@ -32,7 +32,9 @@ func TestExtractGoRoot(t *testing.T) {
 		// Golden folder does not exist
 		t.Skip("No golden files")
 	}
-	var expectGoRoot string = "/usr/local/go"
+
+	const expectGoRoot = "/usr/local/go"
+
 	for _, test := range goldFiles {
 		t.Run("get goroot form "+test, func(t *testing.T) {
 			r := require.New(t)

package.go

@@ -19,7 +19,7 @@ package gore
 
 import (
 	"fmt"
-	"path/filepath"
+	"path"
 	"runtime/debug"
 	"sort"
 	"strings"
@@ -50,7 +50,7 @@ func (f *GoFile) GetSourceFiles(p *Package) []*SourceFile {
 	getSourceFile := func(fileName string) *SourceFile {
 		sf, ok := tmp[fileName]
 		if !ok {
-			return &SourceFile{Name: filepath.Base(fileName)}
+			return &SourceFile{Name: path.Base(fileName)}
 		}
 		return sf
 	}
@@ -118,8 +118,8 @@ type PackageClassifier interface {
 func NewPathPackageClassifier(mainPkgFilepath string) *PathPackageClassifier {
 	return &PathPackageClassifier{
 		mainFilepath: mainPkgFilepath, mainFolders: []string{
-			filepath.Dir(mainPkgFilepath),
-			mainPkgFilepath,
+			path.Dir(mainPkgFilepath),
+			path.Clean(mainPkgFilepath),
 		},
 	}
 }
@@ -160,11 +160,11 @@ func (c *PathPackageClassifier) Classify(pkg *Package) PackageClass {
 		return ClassVendor
 	}
 
-	parentFolder := filepath.Dir(pkg.Filepath)
+	parentFolder := path.Dir(pkg.Filepath)
 
 	if strings.HasPrefix(pkg.Filepath, c.mainFilepath+"/vendor/") ||
-		strings.HasPrefix(pkg.Filepath, filepath.Dir(c.mainFilepath)+"/vendor/") ||
-		strings.HasPrefix(pkg.Filepath, filepath.Dir(filepath.Dir(c.mainFilepath))+"/vendor/") {
+		strings.HasPrefix(pkg.Filepath, path.Dir(c.mainFilepath)+"/vendor/") ||
+		strings.HasPrefix(pkg.Filepath, path.Dir(path.Dir(c.mainFilepath))+"/vendor/") {
 		return ClassVendor
 	}
 
@@ -186,14 +186,13 @@ func (c *PathPackageClassifier) Classify(pkg *Package) PackageClass {
 		}
 	}
 
-	// If the path does not contain the "vendor" in path but has the main package folder name, assume part of main.
+	// If the path does not contain the "vendor" in a path but has the main package folder name, assume part of main.
 	if !strings.Contains(pkg.Filepath, "vendor/") &&
-		(filepath.Base(filepath.Dir(pkg.Filepath)) == filepath.Base(c.mainFilepath)) {
+		(path.Base(path.Dir(pkg.Filepath)) == path.Base(c.mainFilepath)) {
 		return ClassMain
 	}
-
 	// Special case for entry point package.
-	if pkg.Name == "" && filepath.Base(pkg.Filepath) == "runtime" {
+	if pkg.Name == "" && path.Base(pkg.Filepath) == "runtime" {
 		return ClassSTD
 	}
 
@@ -203,12 +202,12 @@ func (c *PathPackageClassifier) Classify(pkg *Package) PackageClass {
 	}
 
 	// Check if it's the main parent package.
-	if pkg.Name != "" && !strings.Contains(pkg.Name, "/") && strings.Contains(c.mainFilepath, pkg.Name) {
+	if pkg.Name != "" && (!strings.Contains(pkg.Name, "/") && strings.Contains(c.mainFilepath, pkg.Name)) {
 		return ClassMain
 	}
 
 	// At this point, if the main package has a file path of "command-line-arguments" and we haven't figured out
-	// what class it is. We assume it being part of the main package.
+	// what class it is. We assume it is part of the main package.
 	if c.mainFilepath == "command-line-arguments" {
 		return ClassMain
 	}
@@ -220,23 +219,31 @@ func (c *PathPackageClassifier) Classify(pkg *Package) PackageClass {
 // Otherwise, false is retuned.
 func IsStandardLibrary(pkg string) bool {
 	_, ok := stdPkgs[pkg]
-	return ok
+	if ok {
+		return true
+	}
+
+	// Detect regexp.(*onePassInst).regexp/syntax type packages
+	tmp := strings.Split(pkg, ".")[0]
+	if len(tmp) < len(pkg) && IsStandardLibrary(tmp) {
+		return true
+	}
+
+	return false
 }
 
 func isGeneratedPackage(pkg *Package) bool {
-	// Detect regexp.(*onePassInst).regexp/syntax type packages
-	tmp := strings.Split(pkg.Name, ".")[0]
-	if len(tmp) < len(pkg.Name) && IsStandardLibrary(tmp) {
+	if pkg.Filepath == "<autogenerated>" {
 		return true
 	}
 
-	// Special case for no package name and path of ".".
-	if pkg.Name == "" && pkg.Filepath == "." {
+	// Special case for no package name and path of "".
+	if pkg.Name == "" && pkg.Filepath == "" {
 		return true
 	}
 
 	// Some internal stuff, classify it as Generated
-	if pkg.Filepath == "." && (pkg.Name == "__x86" || pkg.Name == "__i686") {
+	if pkg.Filepath == "" && (pkg.Name == "__x86" || pkg.Name == "__i686") {
 		return true
 	}