From 3628c2d52f14c1e4dfa0df264086dd55b21a8f44 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Tue, 19 Sep 2017 11:45:58 -0700 Subject: [PATCH] cmd/compile: remove {Mark,Pop}dcl calls in bimport These were previously only relevant for recording scoping level so that invalid 'fallthrough' statements could be rejected. However, that's handled differently since CL 61130 (in particular, there's no use of types.Block anymore), so these calls can be safely removed. Passes toolstash-check. Change-Id: I8631b156594df85b8d39f57acad3ebcf099d52f9 Reviewed-on: https://go-review.googlesource.com/64810 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Robert Griesemer --- src/cmd/compile/internal/gc/bimport.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/cmd/compile/internal/gc/bimport.go b/src/cmd/compile/internal/gc/bimport.go index b676cd2054..7456c42a49 100644 --- a/src/cmd/compile/internal/gc/bimport.go +++ b/src/cmd/compile/internal/gc/bimport.go @@ -1134,53 +1134,43 @@ func (p *importer) node() *Node { return nodl(p.pos(), op, p.expr(), nil) case OIF: - types.Markdcl() n := nodl(p.pos(), OIF, nil, nil) n.Ninit.Set(p.stmtList()) n.Left = p.expr() n.Nbody.Set(p.stmtList()) n.Rlist.Set(p.stmtList()) - types.Popdcl() return n case OFOR: - types.Markdcl() n := nodl(p.pos(), OFOR, nil, nil) n.Ninit.Set(p.stmtList()) n.Left, n.Right = p.exprsOrNil() n.Nbody.Set(p.stmtList()) - types.Popdcl() return n case ORANGE: - types.Markdcl() n := nodl(p.pos(), ORANGE, nil, nil) n.List.Set(p.stmtList()) n.Right = p.expr() n.Nbody.Set(p.stmtList()) - types.Popdcl() return n case OSELECT, OSWITCH: - types.Markdcl() n := nodl(p.pos(), op, nil, nil) n.Ninit.Set(p.stmtList()) n.Left, _ = p.exprsOrNil() n.List.Set(p.stmtList()) - types.Popdcl() return n // case OCASE, OXCASE: // unreachable - mapped to OXCASE case below by exporter case OXCASE: - types.Markdcl() n := nodl(p.pos(), OXCASE, nil, nil) n.List.Set(p.exprList()) // TODO(gri) eventually we must declare variables for type switch // statements (type switch statements are not yet exported) n.Nbody.Set(p.stmtList()) - types.Popdcl() return n // case OFALL: