diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/gc/dcl.c | 6 | ||||
| -rw-r--r-- | src/cmd/gc/subr.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/cmd/gc/dcl.c b/src/cmd/gc/dcl.c index e5d6392e6..c5359dc5c 100644 --- a/src/cmd/gc/dcl.c +++ b/src/cmd/gc/dcl.c @@ -956,6 +956,8 @@ addvar(Node *n, Type *t, int ctxt) s->vargen = gen; s->oname = n; s->offset = 0; + s->oconst = nil; + s->otype = nil; s->lexical = LNAME; n->funcdepth = funcdepth; @@ -1003,6 +1005,8 @@ addtyp(Type *n, int ctxt) redeclare("type", s); s->otype = n; + s->oconst = nil; + s->oname = nil; s->lexical = LATYPE; d = dcl(); @@ -1056,6 +1060,8 @@ addconst(Node *n, Node *e, int ctxt) redeclare("constant", s); s->oconst = e; + s->otype = nil; + s->oname = nil; s->lexical = LNAME; d = dcl(); diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c index a29f28cd0..0e025072c 100644 --- a/src/cmd/gc/subr.c +++ b/src/cmd/gc/subr.c @@ -1045,7 +1045,7 @@ Tpretty(Fmt *fp, Type *t) else fmtprint(fp, "%lS", s); if(strcmp(s->package, package) == 0) - if(s->otype != t || (!s->export && !s->imported)) { + if((s->otype != t || !s->export) && !s->imported) { fmtprint(fp, "·%s", filename); if(t->vargen) fmtprint(fp, "·%d", t->vargen); |