From 7f0821805098ce7d7d58c6bf6c54d1a86b905ca9 Mon Sep 17 00:00:00 2001 From: Dmitriy Vyukov Date: Mon, 26 Nov 2012 22:14:43 +0400 Subject: [PATCH] cnd/gc: fix build R=golang-dev CC=golang-dev https://golang.org/cl/6856097 --- src/cmd/gc/racewalk.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/cmd/gc/racewalk.c b/src/cmd/gc/racewalk.c index c7a802d21c..17e02a19b2 100644 --- a/src/cmd/gc/racewalk.c +++ b/src/cmd/gc/racewalk.c @@ -430,11 +430,8 @@ 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; -- 2.48.1