From: Kunpei Sakai <namusyaka@gmail.com>
Date: Sun, 25 Feb 2018 08:54:44 +0000 (+0900)
Subject: cmd/compile: remove duplicates by using finishcompare
X-Git-Tag: go1.11beta1~1419
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=21343e07d68b8763f15ad8c9f193ba42e15d4aaa;p=gostls13.git

cmd/compile: remove duplicates by using finishcompare

Updates #23834

Change-Id: If05001f9fd6b97d72069f440102eec6e371908dd
Reviewed-on: https://go-review.googlesource.com/97016
Run-TryBot: Kunpei Sakai <namusyaka@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/gc/walk.go b/src/cmd/compile/internal/gc/walk.go
index 02d216ab62..7925e09c80 100644
--- a/src/cmd/compile/internal/gc/walk.go
+++ b/src/cmd/compile/internal/gc/walk.go
@@ -1700,10 +1700,7 @@ opswitch:
 		} else {
 			cmp = nod(OOROR, nod(ONE, lt, rt), nod(ONOT, call, nil))
 		}
-		cmp = typecheck(cmp, Erv)
-		cmp = walkexpr(cmp, init)
-		cmp.Type = n.Type
-		n = cmp
+		n = finishcompare(n, cmp, init)
 
 	case OARRAYLIT, OSLICELIT, OMAPLIT, OSTRUCTLIT, OPTRLIT:
 		if isStaticCompositeLiteral(n) && !canSSAType(n.Type) {