Skip to content

Commit ed462a6

Browse files
committed
cmd/compile: use appendWalkStmt when possible
Change-Id: I718ad2fd98a3d30087e169abdd5ba3cc4f4b36ba Reviewed-on: https://go-review.googlesource.com/c/go/+/403999 TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Matthew Dempsky <[email protected]> Run-TryBot: Cuong Manh Le <[email protected]> Reviewed-by: David Chase <[email protected]>
1 parent b922055 commit ed462a6

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/cmd/compile/internal/walk/complit.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,7 @@ func fixedlit(ctxt initContext, kind initKind, n *ir.CompLitExpr, var_ ir.Node,
258258
case initKindStatic:
259259
genAsStatic(as)
260260
case initKindDynamic, initKindLocalCode:
261-
a = orderStmtInPlace(as, map[string][]*ir.Name{})
262-
a = walkStmt(a)
263-
init.Append(a)
261+
appendWalkStmt(init, orderStmtInPlace(as, map[string][]*ir.Name{}))
264262
default:
265263
base.Fatalf("fixedlit: bad kind %d", kind)
266264
}
@@ -396,19 +394,13 @@ func slicelit(ctxt initContext, n *ir.CompLitExpr, var_ ir.Node, init *ir.Nodes)
396394

397395
// build list of vauto[c] = expr
398396
ir.SetPos(value)
399-
as := typecheck.Stmt(ir.NewAssignStmt(base.Pos, a, value))
400-
as = orderStmtInPlace(as, map[string][]*ir.Name{})
401-
as = walkStmt(as)
402-
init.Append(as)
397+
as := ir.NewAssignStmt(base.Pos, a, value)
398+
appendWalkStmt(init, orderStmtInPlace(typecheck.Stmt(as), map[string][]*ir.Name{}))
403399
}
404400

405401
// make slice out of heap (6)
406402
a = ir.NewAssignStmt(base.Pos, var_, ir.NewSliceExpr(base.Pos, ir.OSLICE, vauto, nil, nil, nil))
407-
408-
a = typecheck.Stmt(a)
409-
a = orderStmtInPlace(a, map[string][]*ir.Name{})
410-
a = walkStmt(a)
411-
init.Append(a)
403+
appendWalkStmt(init, orderStmtInPlace(typecheck.Stmt(a), map[string][]*ir.Name{}))
412404
}
413405

414406
func maplit(n *ir.CompLitExpr, m ir.Node, init *ir.Nodes) {

0 commit comments

Comments
 (0)