aboutsummaryrefslogtreecommitdiff
path: root/test/convlit.go
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2019-09-05 13:33:06 -0700
committerMatthew Dempsky <mdempsky@google.com>2019-09-06 23:15:48 +0000
commit581526ce963f54b01eef95d2a76ecb6fc08ed91c (patch)
treef820c1a93b2dbdfeaa8d6579a0346ad57874a0a7 /test/convlit.go
parentad1f2c96189be58c3c3c248af279b63a4f2466c1 (diff)
downloadgo-581526ce963f54b01eef95d2a76ecb6fc08ed91c.tar.gz
go-581526ce963f54b01eef95d2a76ecb6fc08ed91c.zip
cmd/compile: rewrite untyped constant conversion logic
This CL detangles the hairy mess that was convlit+defaultlit. In particular, it makes the following changes: 1. convlit1 now follows the standard typecheck behavior of setting "n.Type = nil" if there's an error. Notably, this means for a lot of test cases, we now avoid reporting useless follow-on error messages. For example, after reporting that "1 << s + 1.0" has an invalid shift, we no longer also report that it can't be assigned to string. 2. Previously, assignconvfn had some extra logic for trying to suppress errors from convlit/defaultlit so that it could provide its own errors with better context information. Instead, this extra context information is now passed down into convlit1 directly. 3. Relatedly, this CL also removes redundant calls to defaultlit prior to assignconv. As a consequence, when an expression doesn't make sense for a particular assignment (e.g., assigning an untyped string to an integer), the error messages now say "untyped string" instead of just "string". This is more consistent with go/types behavior. 4. defaultlit2 is now smarter about only trying to convert pairs of untyped constants when it's likely to succeed. This allows us to report better error messages for things like 3+"x"; instead of "cannot convert 3 to string" we now report "mismatched types untyped number and untyped string". Passes toolstash-check. Change-Id: I26822a02dc35855bd0ac774907b1cf5737e91882 Reviewed-on: https://go-review.googlesource.com/c/go/+/187657 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'test/convlit.go')
-rw-r--r--test/convlit.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/convlit.go b/test/convlit.go
index 904e1e63b1..de760542da 100644
--- a/test/convlit.go
+++ b/test/convlit.go
@@ -28,8 +28,8 @@ var _ = int(unsafe.Pointer(uintptr(65))) // ERROR "convert"
// implicit conversions merit scrutiny
var s string
var bad1 string = 1 // ERROR "conver|incompatible|invalid|cannot"
-var bad2 = s + 1 // ERROR "conver|incompatible|invalid"
-var bad3 = s + 'a' // ERROR "conver|incompatible|invalid"
+var bad2 = s + 1 // ERROR "conver|incompatible|invalid|cannot"
+var bad3 = s + 'a' // ERROR "conver|incompatible|invalid|cannot"
var bad4 = "a" + 1 // ERROR "literals|incompatible|convert|invalid"
var bad5 = "a" + 'a' // ERROR "literals|incompatible|convert|invalid"