From: Russ Cox <rsc@golang.org>
Date: Thu, 25 Jun 2009 23:57:56 +0000 (-0700)
Subject: the any fix was too aggressive; allow any in any import.
X-Git-Tag: weekly.2009-11-06~1324
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1ea28570ecd3012ba6a99f9d94dc548ca44a4a77;p=gostls13.git

the any fix was too aggressive; allow any in any import.

R=ken
OCL=30768
CL=30768
---

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 32a9298421..a5b4244100 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -272,6 +272,9 @@ importfile(Val *f)
 		return;
 	}
 
+	if(!debug['A'])
+		anysym->def = typenod(types[TANY]);
+
 	if(!findpkg(f->u.sval))
 		fatal("can't find import: %Z", f->u.sval);
 	imp = Bopen(namebuf, OREAD);
@@ -343,12 +346,12 @@ unimportfile(void)
 void
 cannedimports(char *file, char *cp)
 {
-	lineno++;		// if sys.6 is included on line 1,
-	linehist(file, 0, 0);	// the debugger gets confused
-
 	if(!debug['A'])
 		anysym->def = typenod(types[TANY]);
 
+	lineno++;		// if sys.6 is included on line 1,
+	linehist(file, 0, 0);	// the debugger gets confused
+
 	pushedio = curio;
 	curio.bin = nil;
 	curio.peekc = 0;