summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-01-20 15:36:57 -0800
committerRuss Cox <rsc@golang.org>2009-01-20 15:36:57 -0800
commit28f74386f358d8cc06bed33d99ba19f85d223962 (patch)
tree1f3ff13f2e6c632e2248f4814540e1921b314892
parentbe323cab54e32b56ff7c58ce0828a486bb328d3f (diff)
downloadgolang-28f74386f358d8cc06bed33d99ba19f85d223962.tar.gz
6g: better genembedtramp fatal error,
and don't put inaccessible private methods in signature. R=ken OCL=23138 CL=23140
-rw-r--r--src/cmd/6g/obj.c2
-rw-r--r--src/cmd/gc/subr.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/6g/obj.c b/src/cmd/6g/obj.c
index fa2c59ddd..fb2d382a3 100644
--- a/src/cmd/6g/obj.c
+++ b/src/cmd/6g/obj.c
@@ -537,7 +537,7 @@ genembedtramp(Type *t, Sig *b)
if(c == 1)
goto out;
}
- fatal("genembedtramp");
+ fatal("genembedtramp %T.%s", t, b->name);
out:
if(d == 0)
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 428e70551..40912bce6 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -2489,6 +2489,8 @@ expand0(Type *t)
u = methtype(t);
if(u != T) {
for(f=u->method; f!=T; f=f->down) {
+ if(!exportname(f->sym->name) && strcmp(f->sym->package, package) != 0)
+ continue;
if(f->sym->uniq)
continue;
f->sym->uniq = 1;