cmd/go: racewalk: fix nested struct handling

Fixes #4424.
Fixes #4425.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6849093

diff --git a/src/cmd/gc/racewalk.c b/src/cmd/gc/racewalk.c
index 5e2a456ff2bb61c20edd4874f4f70dcdf53d9c4b..c7a802d21cdc1a841faa9a6f467ab06a7cbd1800 100644 (file)
--- a/src/cmd/gc/racewalk.c
+++ b/src/cmd/gc/racewalk.c
@@ -430,6 +430,11 @@ callinstr(Node **np, NodeList **init, int wr, int skip)
                                n = treecopy(n);
                                f = nod(OXDOT, n, newname(t1->sym));
                                f->type = t1;
+<<<<<<< local
+                               if(f->type->etype == TFIELD)
+                                       f->type = f->type->type;
+=======
+>>>>>>> other
                                if(callinstr(&f, init, wr, 0)) {
                                        typecheck(&f, Erv);
                                        res = 1;