From 80795712865ca86bb21ebb9841598ccbcbd375c9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 16 Dec 2020 13:10:58 +0100 Subject: vendor: update go-fuzz Update to HEAD to fix: $ go-fuzz-build ./pkg/tool failed to execute go build: exit status 2 /go1.15/src/reflect/value.go:1432: misplaced compiler directive --- vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/cover.go | 6 ++++-- vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/main.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'vendor/github.com') diff --git a/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/cover.go b/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/cover.go index 5c5d83efb..070863d89 100644 --- a/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/cover.go +++ b/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/cover.go @@ -329,7 +329,7 @@ func (s *Sonar) Visit(n ast.Node) ast.Visitor { Args: []ast.Expr{v1, v2, &ast.BasicLit{Kind: token.INT, Value: strconv.Itoa(id)}}, }, }, - &ast.ReturnStmt{Results: []ast.Expr{&ast.BinaryExpr{Op: nn.Op, X: v1, Y: v2}}}, + &ast.ReturnStmt{Results: []ast.Expr{&ast.BinaryExpr{Op: nn.Op, X: v1, Y: v2, OpPos: nn.Pos()}}}, ) nn.X = &ast.CallExpr{ Fun: &ast.FuncLit{ @@ -653,10 +653,12 @@ func (f *File) addImport(path, name, anyIdent string) { }, } impDecl := &ast.GenDecl{ - Tok: token.IMPORT, + Lparen: f.astFile.Name.End(), + Tok: token.IMPORT, Specs: []ast.Spec{ newImport, }, + Rparen: f.astFile.Name.End(), } // Make the new import the first Decl in the file. astFile := f.astFile diff --git a/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/main.go b/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/main.go index dc43ac2b4..e2d476929 100644 --- a/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/main.go +++ b/vendor/github.com/dvyukov/go-fuzz/go-fuzz-build/main.go @@ -62,8 +62,8 @@ func basePackagesConfig() *packages.Config { cfg := new(packages.Config) // Note that we do not set GO111MODULE here in order to respect any GO111MODULE - // setting by the user as we are finding dependencies. Note, however, that - // we are still setting up a GOPATH to build, so we later will force + // setting by the user as we are finding dependencies. Note, however, that + // we are still setting up a GOPATH to build, so we later will force // GO111MODULE to be off when building so that we are in GOPATH mode. // If the user has not set GO111MODULE, the meaning here is // left up to cmd/go (defaulting to 'auto' in Go 1.11-1.13, -- cgit mrf-deployment