From: Dmitriy Vyukov <dvyukov@google.com>
Date: Mon, 26 Nov 2012 18:11:05 +0000 (+0400)
Subject: cmd/go: racewalk: fix nested struct handling
X-Git-Tag: go1.1rc2~1794
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=db8d7a292db3c781d35db07e50fe32b6258cf022;p=gostls13.git

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 5e2a456ff2..c7a802d21c 100644
--- 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;