Skip to content

Commit

Permalink
cmd/compile: remove redundant parameter from finishcompare
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
  • Loading branch information
josharian committed Mar 24, 2016
1 parent 7e8e9ab commit babc735
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/cmd/compile/internal/gc/walk.go
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@ func walkcompare(n *Node, init *Nodes) *Node {
r = Nod(OOROR, Nod(ONOT, ok, nil), Nod(ONE, x, r))
}
init.Append(expr)
n = finishcompare(n, n, r, init)
n = finishcompare(n, r, init)
return n
}

Expand Down Expand Up @@ -3201,21 +3201,21 @@ func walkcompare(n *Node, init *Nodes) *Node {
if expr == nil {
expr = Nodbool(n.Op == OEQ)
}
n = finishcompare(n, n, expr, init)
n = finishcompare(n, expr, init)
return n
}

if t.Etype == TARRAY {
// Zero- or single-element array, of any type.
switch t.Bound {
case 0:
n = finishcompare(n, n, Nodbool(n.Op == OEQ), init)
n = finishcompare(n, Nodbool(n.Op == OEQ), init)
return n
case 1:
l0 := Nod(OINDEX, l, Nodintconst(0))
r0 := Nod(OINDEX, r, Nodintconst(0))
a := Nod(n.Op, l0, r0)
n = finishcompare(n, n, a, init)
n = finishcompare(n, a, init)
return n
}
}
Expand All @@ -3242,7 +3242,7 @@ func walkcompare(n *Node, init *Nodes) *Node {
if expr == nil {
expr = Nodbool(n.Op == OEQ)
}
n = finishcompare(n, n, expr, init)
n = finishcompare(n, expr, init)
return n
}

Expand All @@ -3260,15 +3260,15 @@ func walkcompare(n *Node, init *Nodes) *Node {
r = Nod(ONOT, r, nil)
}

n = finishcompare(n, n, r, init)
n = finishcompare(n, r, init)
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)
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.
nn = r
nn := r
nn = typecheck(nn, Erv)
nn = walkexpr(nn, init)
r = nn
Expand Down

0 comments on commit babc735

Please sign in to comment.