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 32a92984210e584b17f2945ee13890f6366db213..a5b42441001de4cab2a8ee2aa88255f4ffe52c3d 100644 (file)
--- 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;