From 8e922759b381061cc4709c3e52d522d983521c5a Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Fri, 16 Sep 2016 00:17:33 +1000 Subject: [PATCH] cmd/compile/internal/gc: fix build Fix conflict between CL 29213 and 29134. Change-Id: Ie58bd7195893d7e634f1b257ee0bdd3250cd23c2 Reviewed-on: https://go-review.googlesource.com/29137 TryBot-Result: Gobot Gobot Run-TryBot: Dave Cheney Reviewed-by: Josh Bleecher Snyder --- src/cmd/compile/internal/gc/sinit.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/compile/internal/gc/sinit.go b/src/cmd/compile/internal/gc/sinit.go index 5dcb29ea05..1d3bfbe14f 100644 --- a/src/cmd/compile/internal/gc/sinit.go +++ b/src/cmd/compile/internal/gc/sinit.go @@ -286,7 +286,7 @@ func staticcopy(l *Node, r *Node, out *[]*Node) bool { orig := r r = r.Name.Defn.Right - for r.Op == OCONVNOP && !Eqtype(r.Type, l.Type) { + for r.Op == OCONVNOP && !eqtype(r.Type, l.Type) { r = r.Left }