fix test for go1.17

cmd/xgo/version.go

@@ -2,9 +2,9 @@ package main
 
 import "fmt"
 
-const VERSION = "1.0.18"
-const REVISION = "86b60236af7fe7147b90073421f57187fbf6990a+1"
-const NUMBER = 165
+const VERSION = "1.0.19"
+const REVISION = "7b94c97a1b438510f46aa86fca2b626396b9d2e1+1"
+const NUMBER = 166
 
 func getRevision() string {
 	revSuffix := ""

patch/ctxt/skip_pkg_go1.19_and_below.go

@@ -1,7 +1,7 @@
 //go:build go1.17 && !go1.20
 // +build go1.17,!go1.20
 
-package ctx
+package ctxt
 
 import (
 	"strings"

patch/syntax/call_expr_go1.17_18_19.go

@@ -0,0 +1,16 @@
+//go:build !go1.20
+// +build !go1.20
+
+package syntax
+
+import "cmd/compile/internal/syntax"
+
+func (ctx *BlockContext) traverseCallExpr(node *syntax.CallExpr, globaleNames map[string]*DeclInfo, imports map[string]string) *syntax.CallExpr {
+	if node == nil {
+		return nil
+	}
+	for i, arg := range node.ArgList {
+		node.ArgList[i] = ctx.traverseExpr(arg, globaleNames, imports)
+	}
+	return node
+}

patch/syntax/call_expr_go1.20.go

@@ -0,0 +1,10 @@
+//go:build go1.20
+// +build go1.20
+
+package syntax
+
+import "cmd/compile/internal/syntax"
+
+func (ctx *BlockContext) traverseCallExpr(node syntax.Expr, globaleNames map[string]*DeclInfo, imports map[string]string) syntax.Expr {
+	return ctx.traverseExpr(node, globaleNames, imports)
+}

patch/syntax/vars.go

@@ -46,16 +46,6 @@ func collectVarDecls(declKind DeclKind, names []*syntax.Name, typ syntax.Expr) [
 	return decls
 }
 
-type vis struct {
-}
-
-var _ syntax.Visitor = (*vis)(nil)
-
-// Visit implements syntax.Visitor.
-func (c *vis) Visit(node syntax.Node) (w syntax.Visitor) {
-	return nil
-}
-
 func trapVariables(pkgPath string, fileList []*syntax.File, funcDelcs []*DeclInfo) {
 	names := make(map[string]*DeclInfo, len(funcDelcs))
 	varNames := make(map[string]bool)
@@ -198,7 +188,7 @@ func (ctx *BlockContext) traverseStmt(node syntax.Stmt, globaleNames map[string]
 		return ctx.traverseBlockStmt(node, globaleNames, imports)
 	case *syntax.CallStmt:
 		// defer, go
-		node.Call = ctx.traverseExpr(node.Call, globaleNames, imports)
+		node.Call = ctx.traverseCallExpr(node.Call, globaleNames, imports)
 		return node
 	case *syntax.IfStmt:
 		node.Init = ctx.traverseSimpleStmt(node.Init, globaleNames, imports)

runtime/core/version.go

@@ -6,9 +6,9 @@ import (
 	"os"
 )
 
-const VERSION = "1.0.18"
-const REVISION = "86b60236af7fe7147b90073421f57187fbf6990a+1"
-const NUMBER = 165
+const VERSION = "1.0.19"
+const REVISION = "7b94c97a1b438510f46aa86fca2b626396b9d2e1+1"
+const NUMBER = 166
 
 // these fields will be filled by compiler
 const XGO_VERSION = ""

runtime/functab/functab.go

@@ -60,7 +60,7 @@ func InfoFunc(fn interface{}) *core.FuncInfo {
 func InfoVar(addr interface{}) *core.FuncInfo {
 	ensureMapping()
 	v := reflect.ValueOf(addr)
-	if v.Kind() != reflect.Pointer {
+	if v.Kind() != reflect.Ptr {
 		panic(fmt.Errorf("given type is not a pointer: %T", addr))
 	}
 	ptr := v.Pointer()

runtime/mock/patch.go

@@ -28,7 +28,7 @@ func Patch(fn interface{}, replacer interface{}) func() {
 		if fnType != reflect.TypeOf(replacer) {
 			panic(fmt.Errorf("replacer should have type: %T, actual: %T", fn, replacer))
 		}
-	} else if fnKind == reflect.Pointer {
+	} else if fnKind == reflect.Ptr {
 		replacerType := reflect.TypeOf(replacer)
 		wantType := reflect.FuncOf(nil, []reflect.Type{fnType.Elem()}, false)
 		var targetTypeStr string

support/goinfo/mod.go

@@ -29,7 +29,7 @@ func ResolveMainModule(dir string, args []string) (string, error) {
 
 	return modPath, nil
 
-	// // has quailified name: not starting with ./ or ../
+	// // has qualified name: not starting with ./ or ../
 	// var qualifieldNames []string
 	// for _, arg := range args {
 	// 	if !isRelative(arg) {