gc: handle use of builtin function outside function call

tweaks & tests of last bug fix too.

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

diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index 707546b1095082dd9c409cd22ddd2ed7109bf94a..b6940d412b756e4f0ac21bac365006fbe55a4fb7 100644 (file)
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -89,6 +89,10 @@ typecheck(Node **np, int top)
 redo:
        lno = setlineno(n);
        if(n->sym) {
+               if(n->op == ONAME && n->etype != 0) {
+                       yyerror("use of builtin %S not in function call", n->sym);
+                       goto error;
+               }
                walkdef(n);
                if(n->op == ONONAME)
                        goto error;

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 3098fa525ec188454ebdf2c7a7fde0161104d27b..21bd0b56ea143d6d2f524edf66cd9bf65ae4951d 100644 (file)
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -221,7 +221,9 @@ walkdef(Node *n)
        if(n->op == ONONAME) {
                if(!n->diag) {
                        n->diag = 1;
-                       yyerrorl(n->lineno, "undefined: %S", n->sym);
+                       if(n->lineno != 0)
+                               lineno = n->lineno;
+                       yyerror("undefined: %S", n->sym);
                }
                return;
        }

diff --git a/test/fixedbugs/bug208.go b/test/fixedbugs/bug208.go
index 0a05d80c1a0e15f3e2a386483f6449bc301c9acf..13b0400848d8fdbdc9ad922beff74e40c5f811b9 100644 (file)
--- a/test/fixedbugs/bug208.go
+++ b/test/fixedbugs/bug208.go
@@ -11,10 +11,10 @@ type        T struct
        f int;
 }
 
-var _ = T{f: 1}
-
 // 6g used to get confused by the f:1 above
 // and allow uses of f that would be silently
 // dropped during the compilation.
 var _ = f;     // ERROR "undefined"
 
+var _ = T{f: 1}
+

diff --git a/test/varerr.go b/test/varerr.go
new file mode 100644 (file)
index 0000000..32f33ec
--- /dev/null
+++ b/test/varerr.go
@@ -0,0 +1,14 @@
+// errchk $G $D/$F.go
+
+// Copyright 2010 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
+
+func main() {
+       _ = asdf        // ERROR "undefined: asdf"
+
+       new = 1 // ERROR "use of builtin new not in function call"
+}
+