diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2019-09-06 20:54:36 +0000 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2019-09-06 22:44:48 +0000 |
| commit | e6ba19f9138dfaa981b281105fafabbf55250a18 (patch) | |
| tree | 5d419efc388b623b2f2990098a920bfa56d3c8c4 /src | |
| parent | 8a8cf5bf6d233c97180a6ef7e64d9c67a402470f (diff) | |
| download | go-git-e6ba19f9138dfaa981b281105fafabbf55250a18.tar.gz | |
Revert "cmd/compile: improve errors for invalid conversions of consts"
This reverts commit 2da9c3e0f99b72cf8f3bdca01b57e7a68a546c5b.
Reason for revert: while the new error messages are more informative,
they're not strictly correct. This CL also conflicts with CL 187657.
Change-Id: I1c36cf7e86c2f35ee83a4f98918ee38aa1f59965
Reviewed-on: https://go-review.googlesource.com/c/go/+/193977
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/gc/const.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/cmd/compile/internal/gc/const.go b/src/cmd/compile/internal/gc/const.go index 569cab4390..c5b8d816c6 100644 --- a/src/cmd/compile/internal/gc/const.go +++ b/src/cmd/compile/internal/gc/const.go @@ -413,20 +413,16 @@ func convlit1(n *Node, t *types.Type, explicit bool, reuse canReuseNode) *Node { return n bad: - reportErr := false if !n.Diag() { - reportErr = !t.Broke() + if !t.Broke() { + yyerror("cannot convert %L to type %v", n, t) + } n.SetDiag(true) } if n.Type.IsUntyped() { n = defaultlitreuse(n, nil, reuse) } - - if reportErr { - yyerror("cannot convert %L to type %v", n, t) - } - return n } |