Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.typeparams] cmd/compile/internal/types2: report an error for invalid constant values

Browse source 
This is https://golang.org/cl/271377 ported to types2.

Updates #42695.

Change-Id: I475bdcaeace5b0e87d4476a6d660996534289666
Reviewed-on: https://go-review.googlesource.com/c/go/+/271520
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Robert Griesemer 2020-11-19 09:09:15 -08:00
parent 2140049172
commit 0123c9b321
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/compile/internal/types2/expr.go
View file

@ -1168,7 +1168,11 @@ func (check *Checker) exprInternal(x *operand, e syntax.Expr, hint Type) exprKin
case *syntax.BasicLit:
x.setConst(e.Kind, e.Value)
if x.mode == invalid {
check.invalidASTf(e, "invalid literal %v", e.Value)
// The parser already establishes syntactic correctness.
// If we reach here it's because of number under-/overflow.
// TODO(gri) setConst (and in turn the go/constant package)
// should return an error describing the issue.
check.errorf(e, "malformed constant: %s", e.Value)
goto Error
}

17
src/cmd/compile/internal/types2/fixedbugs/issue42695.src Normal file
View file

@ -0,0 +1,17 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package issue42695
const _ = 6e5518446744 // ERROR malformed constant
const _ uint8 = 6e5518446744 // ERROR malformed constant
var _ = 6e5518446744 // ERROR malformed constant
var _ uint8 = 6e5518446744 // ERROR malformed constant
func f(x int) int {
return x + 6e5518446744 // ERROR malformed constant
}
var _ = f(6e5518446744 /* ERROR malformed constant */ )

8
src/cmd/compile/internal/types2/operand.go
View file

@ -211,9 +211,15 @@ func (x *operand) setConst(k syntax.LitKind, lit string) {
unreachable()
}
val := constant.MakeFromLiteral(lit, tok, 0)
if val.Kind() == constant.Unknown {
x.mode = invalid
x.typ = Typ[Invalid]
return
}
x.mode = constant_
x.typ = Typ[kind]
x.val = constant.MakeFromLiteral(lit, tok, 0)
x.val = val
}
// isNil reports whether x is the nil value.