5g: fix build

R=ken2
CC=golang-dev
https://golang.org/cl/1893042

diff --git a/src/cmd/5g/gobj.c b/src/cmd/5g/gobj.c
index 49c7df1f0280091469658b68cba8fbc16a27b1e9..bf59534b9bd0200c4b8f59b870608d8dbbc9bc27 100644 (file)
--- a/src/cmd/5g/gobj.c
+++ b/src/cmd/5g/gobj.c
@@ -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;

diff --git a/src/cmd/6g/gobj.c b/src/cmd/6g/gobj.c
index a8e32e9fd50660a99af52c3f62a490ff15bfe939..b667ae48a220707b3ad700d25573fb2ca536b4ab 100644 (file)
--- a/src/cmd/6g/gobj.c
+++ b/src/cmd/6g/gobj.c
@@ -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;

diff --git a/src/cmd/8g/gobj.c b/src/cmd/8g/gobj.c
index 6ffdcbcc89f5b54cd21bafa4356277226b8a399c..e48ad529bf05830faeb29d75b7d8d4df4abc21fc 100644 (file)
--- a/src/cmd/8g/gobj.c
+++ b/src/cmd/8g/gobj.c
@@ -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;

diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index 96fce565ef99cfc173ce5355e0fbf99440a36249..cef3153c83d51172aeee9145f4bf5be993a10cfd 100644 (file)
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -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*);

diff --git a/src/cmd/gc/reflect.c b/src/cmd/gc/reflect.c
index 16267ed9d91dcdc552fee00f61e29cfc81777ecc..87b9b04ba2079c9949532f820edc746cf6af026d 100644 (file)
--- a/src/cmd/gc/reflect.c
+++ b/src/cmd/gc/reflect.c
@@ -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);
                        }