diff options
Diffstat (limited to 'src/cmd/6g')
| -rw-r--r-- | src/cmd/6g/cgen.c | 2 | ||||
| -rw-r--r-- | src/cmd/6g/gsubr.c | 4 | ||||
| -rw-r--r-- | src/cmd/6g/obj.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c index 8f8fe7273..0e7db2c06 100644 --- a/src/cmd/6g/cgen.c +++ b/src/cmd/6g/cgen.c @@ -384,7 +384,7 @@ agen(Node *n, Node *res) break; case OCONV: - if(!eqtype(n->type, nl->type)) + if(!cvttype(n->type, nl->type)) fatal("agen: non-trivial OCONV"); agen(nl, res); return; diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c index b29cab304..f63d1c352 100644 --- a/src/cmd/6g/gsubr.c +++ b/src/cmd/6g/gsubr.c @@ -1105,8 +1105,8 @@ naddr(Node *n, Addr *a) if(n->method) { if(n->type != T) if(n->type->sym != S) - if(n->type->sym->opackage != nil) - a->sym = pkglookup(a->sym->name, n->type->sym->opackage); + if(n->type->sym->package != nil) + a->sym = pkglookup(a->sym->name, n->type->sym->package); } switch(n->class) { diff --git a/src/cmd/6g/obj.c b/src/cmd/6g/obj.c index 1970d1fab..25416a936 100644 --- a/src/cmd/6g/obj.c +++ b/src/cmd/6g/obj.c @@ -40,7 +40,7 @@ zname(Biobuf *b, Sym *s, int t) Bputc(b, t); /* type */ Bputc(b, s->sym); /* sym */ - for(n=s->opackage; *n; n++) + for(n=s->package; *n; n++) Bputc(b, *n); Bputdot(b); for(n=s->name; *n; n++) |