Revert "cmd/internal/gc: ignore declarations of types for goto validation"
This reverts commit 5726af54eb3a52b9446a834991110b945e780e99.
It broke all the builds.
Change-Id: I4b1dde86f9433717d303c1dabd6aa1a2bf97fab2
Reviewed-on: https://go-review.googlesource.com/10143
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/src/cmd/internal/gc/gen.go b/src/cmd/internal/gc/gen.go
index bba04d41..cd0e650 100644
--- a/src/cmd/internal/gc/gen.go
+++ b/src/cmd/internal/gc/gen.go
@@ -159,21 +159,6 @@
fs = fs.Link
}
if fs != to.Sym {
- // more declarations at label than at goto.
- // figure out if they are all types.
- ts := to.Sym
- ntt := nt
- for ; ntt > nf; ntt-- {
- if ts.whyPushed != OTYPE {
- break
- }
- ts = ts.Link
- }
- // all types, nothing to see here.
- if ntt == nf {
- return
- }
-
lno := int(lineno)
setlineno(from)
@@ -183,11 +168,11 @@
var block *Sym
var dcl *Sym
- ts = to.Sym
+ ts := to.Sym
for ; nt > nf; nt-- {
if ts.Pkg == nil {
block = ts
- } else if ts.whyPushed != OTYPE {
+ } else {
dcl = ts
}
ts = ts.Link
@@ -196,7 +181,7 @@
for ts != fs {
if ts.Pkg == nil {
block = ts
- } else if ts.whyPushed != OTYPE {
+ } else {
dcl = ts
}
ts = ts.Link
