Skip to content

Commit 34c58fe

Browse files
Yury Smolskygriesemer
Yury Smolsky
authored andcommitted
cmd/compile: use embedlineno instead of lineno in copytype
Also remove lineno from typecheckdeftype since copytype was the only user of it and typecheck uses lineno independently. toolstach-check passed. Updates #19683. Change-Id: I1663fdb8cf519d505cc087c8657dcbff3c8b1a0a Reviewed-on: https://go-review.googlesource.com/114875 Run-TryBot: Yury Smolsky <[email protected]> Reviewed-by: Robert Griesemer <[email protected]>
1 parent e34f660 commit 34c58fe

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/cmd/compile/internal/gc/typecheck.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -3608,21 +3608,14 @@ func copytype(n *Node, t *types.Type) {
36083608
}
36093609

36103610
// Double-check use of type as embedded type.
3611-
lno := lineno
3612-
36133611
if embedlineno.IsKnown() {
3614-
lineno = embedlineno
36153612
if t.IsPtr() || t.IsUnsafePtr() {
3616-
yyerror("embedded type cannot be a pointer")
3613+
yyerrorl(embedlineno, "embedded type cannot be a pointer")
36173614
}
36183615
}
3619-
3620-
lineno = lno
36213616
}
36223617

36233618
func typecheckdeftype(n *Node) {
3624-
lno := lineno
3625-
setlineno(n)
36263619
n.Type.Sym = n.Sym
36273620
n.SetTypecheck(1)
36283621
n.Name.Param.Ntype = typecheck(n.Name.Param.Ntype, Etype)
@@ -3637,8 +3630,6 @@ func typecheckdeftype(n *Node) {
36373630
// that don't come along.
36383631
copytype(n, t)
36393632
}
3640-
3641-
lineno = lno
36423633
}
36433634

36443635
func typecheckdef(n *Node) {

0 commit comments

Comments
 (0)