From fefd32a97664a69a863420baf6c604c7dc979e3b Mon Sep 17 00:00:00 2001 From: Takuya Ueda Date: Tue, 10 Dec 2019 19:48:59 +0900 Subject: [PATCH] Remove default case for unexpected types --- passes/wraperr/testdata/src/a/a.go | 17 +++++++++++++++++ passes/wraperr/wraperr.go | 2 -- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/passes/wraperr/testdata/src/a/a.go b/passes/wraperr/testdata/src/a/a.go index c7f4b07..13f20fb 100644 --- a/passes/wraperr/testdata/src/a/a.go +++ b/passes/wraperr/testdata/src/a/a.go @@ -112,3 +112,20 @@ func f9(ctx context.Context, client *spanner.Client) { return lib.SpannerErr() // OK }) } + +func f10(ctx context.Context, client *spanner.Client) { + var outsideErr error + client.ReadWriteTransaction(ctx, func(ctx context.Context, txn *spanner.ReadWriteTransaction) error { + // Because err is a free variable, + // err may be assigned in other goroutines. + outsideErr = func(txn *spanner.ReadWriteTransaction) error { + stmt := spanner.Statement{SQL: `SELECT 1`} + _, err := client.Single().Query(ctx, stmt).Next() + if err != nil { + return &wrapErr{err} + } + return nil + }(txn) // OK + return outsideErr + }) +} diff --git a/passes/wraperr/wraperr.go b/passes/wraperr/wraperr.go index 316573a..f731c9d 100644 --- a/passes/wraperr/wraperr.go +++ b/passes/wraperr/wraperr.go @@ -123,8 +123,6 @@ func (r *runner) returnedWrappedErr(v ssa.Value) token.Pos { if r.returnedWrappedErr(v.Common().Value) != token.NoPos { return v.Pos() } - default: - return v.Pos() } } }