Commit3b7e6e8

committed

[release-branch.go1.1] cmd/gc: compute initialization order for top-level blank vars too.

««« CL 8601044 / 3a74e15c5d56cmd/gc: compute initialization order for top-level blank vars too.Fixes#5244.R=golang-dev, rsc, iant, r, daniel.morsingCC=golang-devhttps://golang.org/cl/8601044»»»R=iant, rscCC=golang-devhttps://golang.org/cl/10250043

1 parent13af44f commit3b7e6e8Copy full SHA for 3b7e6e8

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ init1(Node n, NodeList *out)`
`53`	`53`	`if(isblank(n)&&n->curfn==N&&n->defn!=N&&n->defn->initorder==InitNotStarted) {`
`54`	`54`	`// blank names initialization is part of init() but not`
`55`	`55`	`// when they are inside a function.`
`56`		`-n->defn->initorder=InitDone;`
`57`		`-if(debug['%'])dump("nonstatic",n->defn);`
`58`		`-out=list(out,n->defn);`
	`56`	`+break;`
`59`	`57`	`}`
`60`	`58`	`return;`
`61`	`59`	`}`
`@@ -130,7 +128,7 @@ init1(Node n, NodeList *out)`
`130`	`128`	`init2(n->defn->right,out);`
`131`	`129`	`if(debug['j'])`
`132`	`130`	`print("%S\n",n->sym);`
`133`		`-if(!staticinit(n,out)) {`
	`131`	`+if(isblank(n)\|\|!staticinit(n,out)) {`
`134`	`132`	`if(debug['%'])dump("nonstatic",n->defn);`
`135`	`133`	`out=list(out,n->defn);`
`136`	`134`	`}`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+// run`
	`2`	`+`
	`3`	`+// Copyright 2013 The Go Authors. All rights reserved.`
	`4`	`+// Use of this source code is governed by a BSD-style`
	`5`	`+// license that can be found in the LICENSE file.`
	`6`	`+`
	`7`	`+// Issue 5244: the init order computation uses the wrong`
	`8`	`+// order for top-level blank identifier assignments.`
	`9`	`+// The example used to panic because it tries calling a`
	`10`	`+// nil function instead of assigning to f before.`
	`11`	`+`
	`12`	`+package main`
	`13`	`+`
	`14`	`+varf=func()int {return1 }`
	`15`	`+var_=f()+g()`
	`16`	`+varg=func()int {return2 }`
	`17`	`+`
	`18`	`+funcmain() {}`

Comments

(0)