Commit babc7354 authored by Josh Bleecher Snyder's avatar Josh Bleecher Snyder

cmd/compile: remove redundant parameter from finishcompare

This is follow-up 3 of 3 to CL 20959.

Passes toolstash -cmp.

Change-Id: I06efded21bbc970cbefa10e8f2cac1ebc6942e1b
Reviewed-on: https://go-review.googlesource.com/21054
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 7e8e9abe
...@@ -3130,7 +3130,7 @@ func walkcompare(n *Node, init *Nodes) *Node { ...@@ -3130,7 +3130,7 @@ func walkcompare(n *Node, init *Nodes) *Node {
r = Nod(OOROR, Nod(ONOT, ok, nil), Nod(ONE, x, r)) r = Nod(OOROR, Nod(ONOT, ok, nil), Nod(ONE, x, r))
} }
init.Append(expr) init.Append(expr)
n = finishcompare(n, n, r, init) n = finishcompare(n, r, init)
return n return n
} }
...@@ -3201,7 +3201,7 @@ func walkcompare(n *Node, init *Nodes) *Node { ...@@ -3201,7 +3201,7 @@ func walkcompare(n *Node, init *Nodes) *Node {
if expr == nil { if expr == nil {
expr = Nodbool(n.Op == OEQ) expr = Nodbool(n.Op == OEQ)
} }
n = finishcompare(n, n, expr, init) n = finishcompare(n, expr, init)
return n return n
} }
...@@ -3209,13 +3209,13 @@ func walkcompare(n *Node, init *Nodes) *Node { ...@@ -3209,13 +3209,13 @@ func walkcompare(n *Node, init *Nodes) *Node {
// Zero- or single-element array, of any type. // Zero- or single-element array, of any type.
switch t.Bound { switch t.Bound {
case 0: case 0:
n = finishcompare(n, n, Nodbool(n.Op == OEQ), init) n = finishcompare(n, Nodbool(n.Op == OEQ), init)
return n return n
case 1: case 1:
l0 := Nod(OINDEX, l, Nodintconst(0)) l0 := Nod(OINDEX, l, Nodintconst(0))
r0 := Nod(OINDEX, r, Nodintconst(0)) r0 := Nod(OINDEX, r, Nodintconst(0))
a := Nod(n.Op, l0, r0) a := Nod(n.Op, l0, r0)
n = finishcompare(n, n, a, init) n = finishcompare(n, a, init)
return n return n
} }
} }
...@@ -3242,7 +3242,7 @@ func walkcompare(n *Node, init *Nodes) *Node { ...@@ -3242,7 +3242,7 @@ func walkcompare(n *Node, init *Nodes) *Node {
if expr == nil { if expr == nil {
expr = Nodbool(n.Op == OEQ) expr = Nodbool(n.Op == OEQ)
} }
n = finishcompare(n, n, expr, init) n = finishcompare(n, expr, init)
return n return n
} }
...@@ -3260,15 +3260,15 @@ func walkcompare(n *Node, init *Nodes) *Node { ...@@ -3260,15 +3260,15 @@ func walkcompare(n *Node, init *Nodes) *Node {
r = Nod(ONOT, r, nil) r = Nod(ONOT, r, nil)
} }
n = finishcompare(n, n, r, init) n = finishcompare(n, r, init)
return n return n
} }
// The result of finishcompare MUST be assigned back to nn, e.g. // The result of finishcompare MUST be assigned back to n, e.g.
// n.Left = finishcompare(n.Left, x, r, init) // n.Left = finishcompare(n.Left, x, r, init)
func finishcompare(nn *Node, n, r *Node, init *Nodes) *Node { func finishcompare(n, r *Node, init *Nodes) *Node {
// Use nn here to avoid passing r to typecheck. // Use nn here to avoid passing r to typecheck.
nn = r nn := r
nn = typecheck(nn, Erv) nn = typecheck(nn, Erv)
nn = walkexpr(nn, init) nn = walkexpr(nn, init)
r = nn r = nn
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment