From 26e43779f119683e8571ec109a7bf502ebe95d9a Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 4 Nov 2016 17:01:34 -0700 Subject: [PATCH] Revert "cmd/vet: teach vet about ast.AliasSpec" This reverts commit aa8c8e770e6db895405b66d38867c2368d94024a. Reason: Decision to back out current alias implementation. For #16339. Change-Id: I4db9a8d6b3625c794be9d2f1ff0e9c047f383d28 Reviewed-on: https://go-review.googlesource.com/32827 Run-TryBot: Robert Griesemer TryBot-Result: Gobot Gobot Reviewed-by: Chris Manghane --- src/cmd/vet/copylock.go | 5 +---- src/cmd/vet/shadow.go | 3 ++- src/cmd/vet/testdata/copylock.go | 9 --------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/cmd/vet/copylock.go b/src/cmd/vet/copylock.go index e8f94fc685..31c1257a47 100644 --- a/src/cmd/vet/copylock.go +++ b/src/cmd/vet/copylock.go @@ -61,10 +61,7 @@ func checkCopyLocksGenDecl(f *File, gd *ast.GenDecl) { return } for _, spec := range gd.Specs { - valueSpec, ok := spec.(*ast.ValueSpec) - if !ok { - continue - } + valueSpec := spec.(*ast.ValueSpec) for i, x := range valueSpec.Values { if path := lockPathRhs(f, x); path != nil { f.Badf(x.Pos(), "variable declaration copies lock value to %v: %v", valueSpec.Names[i].Name, path) diff --git a/src/cmd/vet/shadow.go b/src/cmd/vet/shadow.go index 764129d94c..29c952fd88 100644 --- a/src/cmd/vet/shadow.go +++ b/src/cmd/vet/shadow.go @@ -188,7 +188,8 @@ func checkShadowDecl(f *File, d *ast.GenDecl) { for _, spec := range d.Specs { valueSpec, ok := spec.(*ast.ValueSpec) if !ok { - continue + f.Badf(spec.Pos(), "invalid AST: var GenDecl not ValueSpec") + return } // Don't complain about deliberate redeclarations of the form // var i = i diff --git a/src/cmd/vet/testdata/copylock.go b/src/cmd/vet/testdata/copylock.go index 52ac29c47c..35ed766f1d 100644 --- a/src/cmd/vet/testdata/copylock.go +++ b/src/cmd/vet/testdata/copylock.go @@ -1,7 +1,6 @@ package testdata import ( - "runtime" "sync" "sync/atomic" ) @@ -157,11 +156,3 @@ func AtomicTypesCheck() { vP := &vX vZ := &atomic.Value{} } - -// ensure we don't crash when we encounter aliases; issue 17755 - -var _ => runtime.MemProfileRate - -const _ => runtime.Compiler - -type _ => sync.Mutex -- 2.48.1