Fix dvyukov#294 for reflect/value.go

oraluben · Aug 27, 2020 · a527988 · a527988
1 parent be3528f
commit a527988
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/go-fuzz-build/cover.go b/go-fuzz-build/cover.go
@@ -320,7 +320,7 @@ func (s *Sonar) Visit(n ast.Node) ast.Visitor {
 		return v
 	}
 	v1 = conv("__gofuzz_v1", v1)
-	v2 = conv("__gofuzz_v2", v2)
+	v2 = exprWithMaxPos(conv("__gofuzz_v2", v2), 1)
 
 	block.List = append(block.List,
 		&ast.ExprStmt{
@@ -342,6 +342,23 @@ func (s *Sonar) Visit(n ast.Node) ast.Visitor {
 	return nil
 }
 
+func min(p1, p2 token.Pos) token.Pos {
+	if p1 < p2 {
+		return p1
+	} else {
+		return p1
+	}
+}
+
+func exprWithMaxPos(expr ast.Expr, pos token.Pos) ast.Expr {
+	switch expr := expr.(type) {
+	case *ast.Ident:
+		expr.NamePos = min(pos, expr.NamePos)
+		return expr
+	}
+	return expr
+}
+
 func isWeirdShift(info *types.Info, n ast.Expr) bool {
 	w := &WeirdShiftWalker{info: info}
 	ast.Walk(w, n)
@@ -646,14 +663,18 @@ func (f *File) Visit(node ast.Node) ast.Visitor {
 
 func (f *File) addImport(path, name, anyIdent string) {
 	newImport := &ast.ImportSpec{
-		Name: ast.NewIdent(name),
+		Name: &ast.Ident{
+			NamePos: 1,
+			Name:    name,
+		},
 		Path: &ast.BasicLit{
 			Kind:  token.STRING,
 			Value: fmt.Sprintf("%q", path),
 		},
 	}
 	impDecl := &ast.GenDecl{
-		Tok: token.IMPORT,
+		TokPos: 1,
+		Tok:    token.IMPORT,
 		Specs: []ast.Spec{
 			newImport,
 		},

diff --git a/go.mod b/go.mod
@@ -0,0 +1,5 @@
+module github.com/dvyukov/go-fuzz
+
+go 1.15
+
+require golang.org/x/tools v0.0.0-20200827010519-17fd2f27a9e3
diff --git a/go.sum b/go.sum
@@ -0,0 +1,22 @@
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200827010519-17fd2f27a9e3 h1:r3P/5xOq/dK1991B65Oy6E1fRF/2d/fSYZJ/fXGVfJc=
+golang.org/x/tools v0.0.0-20200827010519-17fd2f27a9e3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=