diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2020-11-23 13:42:43 -0800 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2020-11-24 19:50:09 +0000 |
| commit | 742c05e3bce2cf2f4631762cb5fb733d2a92bc91 (patch) | |
| tree | 943cecaf2c6429f458726ea215721382897dbd74 /src/cmd/compile/fmtmap_test.go | |
| parent | 015423a15bcfae148d5121bcf4ba5b50d0847cd0 (diff) | |
| download | go-742c05e3bce2cf2f4631762cb5fb733d2a92bc91.tar.xz | |
[dev.regabi] cmd/compile: prep refactoring for switching to go/constant
This CL replaces gc.Ctype (along with its CTINT, etc. constants) with
constant.Kind; renames Val.Ctype to Val.Kind; and replaces a handful
of abstraction-violating patterns that can be readily expressed
differently.
The next commit will actually replace Val with constant.Value.
Passes toolstash-check.
[git-generate]
cd src/cmd/compile/internal/gc
sed -i 's/type Ctype uint8/type Ctype = constant.Kind/' const.go
goimports -w const.go
rf '
inline -rm Ctype
mv Val.Ctype Val.Kind
ex import "go/constant"; \
CTxxx -> constant.Unknown; \
CTINT -> constant.Int; \
CTFLT -> constant.Float; \
CTCPLX -> constant.Complex; \
CTBOOL -> constant.Bool; \
CTSTR -> constant.String
rm CTxxx CTINT CTFLT CTCPLX CTBOOL CTSTR
ex import "cmd/compile/internal/types"; \
var t *types.Type; \
var v, v2 Val; \
v.U.(*Mpint).Cmp(maxintval[TINT]) > 0 -> doesoverflow(v, types.Types[TINT]); \
v.U.(*Mpint).Cmp(v2.U.(*Mpint)) > 0 -> compareOp(v, OGT, v2); \
maxintval[t.Etype].Cmp(maxintval[TUINT]) <= 0 -> t.Size() <= types.Types[TUINT].Size(); \
maxintval[t.Etype].Cmp(maxintval[TUINT]) > 0 -> t.Size() > types.Types[TUINT].Size();
'
go test cmd/compile -u
Change-Id: I6c22ec0597508845f88eee639a0d76cbaa66d08f
Reviewed-on: https://go-review.googlesource.com/c/go/+/272653
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
Trust: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/cmd/compile/fmtmap_test.go')
| -rw-r--r-- | src/cmd/compile/fmtmap_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/compile/fmtmap_test.go b/src/cmd/compile/fmtmap_test.go index a8698de307..51134e4919 100644 --- a/src/cmd/compile/fmtmap_test.go +++ b/src/cmd/compile/fmtmap_test.go @@ -85,8 +85,6 @@ var knownFormats = map[string]string{ "cmd/compile/internal/gc.Class %d": "", "cmd/compile/internal/gc.Class %s": "", "cmd/compile/internal/gc.Class %v": "", - "cmd/compile/internal/gc.Ctype %d": "", - "cmd/compile/internal/gc.Ctype %v": "", "cmd/compile/internal/gc.Nodes %#v": "", "cmd/compile/internal/gc.Nodes %+v": "", "cmd/compile/internal/gc.Nodes %.v": "", @@ -138,6 +136,8 @@ var knownFormats = map[string]string{ "float64 %.3f": "", "float64 %.6g": "", "float64 %g": "", + "go/constant.Kind %d": "", + "go/constant.Kind %v": "", "int %#x": "", "int %-12d": "", "int %-6d": "", |