gc: top-level closure bug

Fixes #2055.

R=ken2
CC=golang-dev
https://golang.org/cl/4816059

diff --git a/src/cmd/gc/closure.c b/src/cmd/gc/closure.c
index 7e7b405260cf48307b8a74eb803037f70d4c6f0a..1261eefb7d64adba70156c1e3c2a5eae0cf81abe 100644 (file)
--- a/src/cmd/gc/closure.c
+++ b/src/cmd/gc/closure.c
@@ -84,6 +84,11 @@ typecheckclosure(Node *func, int top)
        oldfn = curfn;
        typecheck(&func->ntype, Etype);
        func->type = func->ntype->type;
+       if(curfn == nil) {
+               xtop = list(xtop, func);
+               return;
+       }
+
        if(func->type != T) {
                curfn = func;
                typechecklist(func->nbody, Etop);

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 6845a8ecd655b686bd2cc496072ae5395f51753e..24a244e40fec680c72354bdc98e029cfb40eda80 100644 (file)
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -255,7 +255,7 @@ main(int argc, char *argv[])
        resumecheckwidth();
 
        for(l=xtop; l; l=l->next)
-               if(l->n->op == ODCLFUNC) {
+               if(l->n->op == ODCLFUNC || l->n->op == OCLOSURE) {
                        curfn = l->n;
                        saveerrors();
                        typechecklist(l->n->nbody, Etop);
@@ -274,8 +274,9 @@ main(int argc, char *argv[])
        while(closures) {
                l = closures;
                closures = nil;
-               for(; l; l=l->next)
+               for(; l; l=l->next) {
                        funccompile(l->n, 1);
+               }
        }
 
        for(l=externdcl; l; l=l->next)

diff --git a/test/fixedbugs/bug355.go b/test/fixedbugs/bug355.go
new file mode 100644 (file)
index 0000000..a9cf016
--- /dev/null
+++ b/test/fixedbugs/bug355.go
@@ -0,0 +1,18 @@
+// $G $D/$F.go && $L $F.$A && ./$A.out
+
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+var f = func() int {
+       type S int
+       return 42
+}
+
+func main() {
+       if f() != 42 {
+               panic("BUG: bug355")
+       }
+}