Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: delete Func.Outer

Browse source 
This was just storage for a linked list.

Change-Id: I850e8db1e1f5e72410f5c904be9409179b56a94a
Reviewed-on: https://go-review.googlesource.com/23484
Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
Russ Cox 2016-05-26 23:43:19 -04:00
parent cedc7c8f20
commit 93369001c7
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/cmd/compile/internal/gc/dcl.go
View file

@ -505,10 +505,8 @@ func ifacedcl(n *Node) {
n.Func = new(Func)
n.Func.FCurfn = Curfn
dclcontext = PPARAM
markdcl()
Funcdepth++
n.Func.Outer = Curfn
Curfn = n
funcstart(n)
funcargs(n.Right)
// funcbody is normally called after the parser has
@ -535,11 +533,7 @@ func funchdr(n *Node) {
}
dclcontext = PAUTO
markdcl()
Funcdepth++
n.Func.Outer = Curfn
Curfn = n
funcstart(n)
if n.Func.Nname != nil {
funcargs(n.Func.Nname.Name.Param.Ntype)
@ -672,6 +666,19 @@ func funcargs2(t *Type) {
}
}
var funcstack []*Node // stack of previous values of Curfn
var Funcdepth int32 // len(funcstack) during parsing, but then forced to be the same later during compilation
// start the function.
// called before funcargs; undone at end of funcbody.
func funcstart(n *Node) {
markdcl()
funcstack = append(funcstack, Curfn)
Funcdepth++
Curfn = n
}
// finish the body.
// called in auto-declaration context.
// returns in extern-declaration context.
@ -681,9 +688,8 @@ func funcbody(n *Node) {
Fatalf("funcbody: unexpected dclcontext %d", dclcontext)
}
popdcl()
funcstack, Curfn = funcstack[:len(funcstack)-1], funcstack[len(funcstack)-1]
Funcdepth--
Curfn = n.Func.Outer
n.Func.Outer = nil
if Funcdepth == 0 {
dclcontext = PEXTERN
}