Skip to content

Commit 334835e

Browse files
mdempskygopherbot
authored andcommitted
cmd/compile/internal/noder: remove wrapName
The OPARENs inserted here used to be necessary for better error diagnostics, but now those are handled by types2. Change-Id: I88d50d34d9e00cdd7d0fb32f6e460a179345a787 Reviewed-on: https://go-review.googlesource.com/c/go/+/573115 Auto-Submit: Matthew Dempsky <[email protected]> Reviewed-by: Than McIntosh <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 364687b commit 334835e

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/cmd/compile/internal/noder/reader.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ func (r *reader) compLit() ir.Node {
29652965
*elemp, elemp = kv, &kv.Value
29662966
}
29672967

2968-
*elemp = wrapName(r.pos(), r.expr())
2968+
*elemp = r.expr()
29692969
}
29702970

29712971
lit := typecheck.Expr(ir.NewCompLitExpr(pos, ir.OCOMPLIT, typ, elems))
@@ -2980,23 +2980,6 @@ func (r *reader) compLit() ir.Node {
29802980
return lit
29812981
}
29822982

2983-
func wrapName(pos src.XPos, x ir.Node) ir.Node {
2984-
// These nodes do not carry line numbers.
2985-
// Introduce a wrapper node to give them the correct line.
2986-
switch x.Op() {
2987-
case ir.OTYPE, ir.OLITERAL:
2988-
if x.Sym() == nil {
2989-
break
2990-
}
2991-
fallthrough
2992-
case ir.ONAME, ir.ONONAME, ir.ONIL:
2993-
p := ir.NewParenExpr(pos, x)
2994-
p.SetImplicit(true)
2995-
return p
2996-
}
2997-
return x
2998-
}
2999-
30002983
func (r *reader) funcLit() ir.Node {
30012984
r.Sync(pkgbits.SyncFuncLit)
30022985

src/cmd/compile/internal/noder/writer.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,6 @@ func (w *writer) compLit(lit *syntax.CompositeLit) {
23042304
elem = kv.Value
23052305
}
23062306
}
2307-
w.pos(elem)
23082307
w.implicitConvExpr(elemType, elem)
23092308
}
23102309
}

0 commit comments

Comments
 (0)