From 34c58fe184fa73ecff0e7142fcf567b1a9abc01b Mon Sep 17 00:00:00 2001 From: Yury Smolsky Date: Mon, 28 May 2018 13:20:45 +0300 Subject: [PATCH] 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 Reviewed-by: Robert Griesemer --- src/cmd/compile/internal/gc/typecheck.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 51dd0dba87..370f21befb 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -3608,21 +3608,14 @@ func copytype(n *Node, t *types.Type) { } // Double-check use of type as embedded type. - lno := lineno - if embedlineno.IsKnown() { - lineno = embedlineno if t.IsPtr() || t.IsUnsafePtr() { - yyerror("embedded type cannot be a pointer") + yyerrorl(embedlineno, "embedded type cannot be a pointer") } } - - lineno = lno } func typecheckdeftype(n *Node) { - lno := lineno - setlineno(n) n.Type.Sym = n.Sym n.SetTypecheck(1) n.Name.Param.Ntype = typecheck(n.Name.Param.Ntype, Etype) @@ -3637,8 +3630,6 @@ func typecheckdeftype(n *Node) { // that don't come along. copytype(n, t) } - - lineno = lno } func typecheckdef(n *Node) { -- 2.50.0