a,b := fun()

SVN=125998

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 6bf97911e4b5d9555ff5022e5d94fce27935cc89..72ff4b8f1ecb191c1af273501f4214a99715244c 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -1231,10 +1231,8 @@ eqtype(Type *t1, Type *t2, int d)
                return 1;
        if(t1 == T || t2 == T)
                return 0;
-
        if(t1->etype != t2->etype)
                return 0;
-
        switch(t1->etype) {
        case TINTER:
        case TSTRUCT:

diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 258a087f73be5569d45a1d7afc6efde90c1a18b6..0110fe407317d46365d4657fbef47b9209ee2b50 100644 (file)
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -224,7 +224,6 @@ loop:
 
                l = n->left;
                r = n->right;
-
                walktype(l, Elv);
                if(l == N || r == N)
                        goto ret;
@@ -1749,7 +1748,7 @@ multi:
                l = listfirst(&savel, &nl);
                t = structfirst(&saver, getoutarg(t));
                while(l != N) {
-                       a = old2new(l, t);
+                       a = old2new(l, t->type);
                        if(n == N)
                                n = a;
                        else