Commit f930d281 authored by Russ Cox's avatar Russ Cox

5g: fix build

R=ken2
CC=golang-dev
https://golang.org/cl/1893042
parent 4501e18a
......@@ -633,10 +633,10 @@ dsymptr(Sym *s, int off, Sym *x, int xoff)
void
genembedtramp(Type *rcvr, Type *method, Sym *newnam)
genembedtramp(Type *rcvr, Type *method, Sym *newnam, int iface)
{
// TODO(kaib): re-implement genembedtramp
genwrapper(rcvr, method, newnam);
genwrapper(rcvr, method, newnam, iface);
/*
Sym *e;
int c, d, o;
......
......@@ -633,7 +633,7 @@ dsymptr(Sym *s, int off, Sym *x, int xoff)
}
void
genembedtramp(Type *rcvr, Type *method, Sym *newnam)
genembedtramp(Type *rcvr, Type *method, Sym *newnam, int iface)
{
Sym *e;
int c, d, o, mov, add, loaded;
......
......@@ -642,7 +642,7 @@ dsymptr(Sym *s, int off, Sym *x, int xoff)
}
void
genembedtramp(Type *rcvr, Type *method, Sym *newnam)
genembedtramp(Type *rcvr, Type *method, Sym *newnam, int iface)
{
Sym *e;
int c, d, o, mov, add, loaded;
......
......@@ -1209,7 +1209,7 @@ void dumpfuncs(void);
void gdata(Node*, Node*, int);
void gdatacomplex(Node*, Mpcplx*);
void gdatastring(Node*, Strlit*);
void genembedtramp(Type*, Type*, Sym*);
void genembedtramp(Type*, Type*, Sym*, int iface);
void ggloblnod(Node *nam, int32 width);
void ggloblsym(Sym *s, int32 width, int dupok);
Prog* gjmp(Prog*);
......
......@@ -199,7 +199,7 @@ methods(Type *t)
// is a pointer adjustment and a JMP.
if(isptr[it->etype] && isptr[this->etype]
&& f->embedded && !isifacemethod(f->type))
genembedtramp(it, f, a->isym);
genembedtramp(it, f, a->isym, 1);
else
genwrapper(it, f, a->isym, 1);
}
......@@ -212,7 +212,7 @@ methods(Type *t)
oldlist = pc;
if(isptr[t->etype] && isptr[this->etype]
&& f->embedded && !isifacemethod(f->type))
genembedtramp(t, f, a->tsym);
genembedtramp(t, f, a->tsym, 0);
else
genwrapper(t, f, a->tsym, 0);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment