From 048c766e660e70e6e3779e479a2ab535b3865a21 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Wed, 19 Sep 2018 16:19:05 -0700 Subject: [PATCH] cmd/compile/internal/gc: minor code reorg (cleanup) Found while tracking down #26855. Change-Id: Ice137fe390820ba351e1c7439b6a9a1b3bdc966b Reviewed-on: https://go-review.googlesource.com/136396 Run-TryBot: Robert Griesemer TryBot-Result: Gobot Gobot Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/gc/fmt.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cmd/compile/internal/gc/fmt.go b/src/cmd/compile/internal/gc/fmt.go index d3d672ea32..5d2e36ee51 100644 --- a/src/cmd/compile/internal/gc/fmt.go +++ b/src/cmd/compile/internal/gc/fmt.go @@ -1304,16 +1304,14 @@ func (n *Node) exprfmt(s fmt.State, prec int, mode fmtMode) { mode.Fprintf(s, "%v { %v }", n.Type, n.Func.Closure.Nbody) case OCOMPLIT: - ptrlit := n.Right != nil && n.Right.Implicit() && n.Right.Type != nil && n.Right.Type.IsPtr() if mode == FErr { if n.Right != nil && n.Right.Type != nil && !n.Implicit() { - if ptrlit { + if n.Right.Implicit() && n.Right.Type.IsPtr() { mode.Fprintf(s, "&%v literal", n.Right.Type.Elem()) return - } else { - mode.Fprintf(s, "%v literal", n.Right.Type) - return } + mode.Fprintf(s, "%v literal", n.Right.Type) + return } fmt.Fprint(s, "composite literal") -- 2.50.0