diff options
author | Meng Zhuo <mzh@golangcn.org> | 2020-12-28 15:22:47 +0800 |
---|---|---|
committer | Meng Zhuo <mzh@golangcn.org> | 2020-12-28 07:45:19 +0000 |
commit | ed9772e130d81b3a5a7b9e9b58e8d48a5ec4c319 (patch) | |
tree | 76c793ed6e4d1d858cdad1c7e6988c84a38a8747 /src/cmd/compile/internal/types | |
parent | a59d26603f0dffbe6e914bc9ab29a2f9f70e5408 (diff) | |
download | go-ed9772e130d81b3a5a7b9e9b58e8d48a5ec4c319.tar.gz go-ed9772e130d81b3a5a7b9e9b58e8d48a5ec4c319.zip |
[dev.regabi] cmd/compile: add explicit file name in types generation
The stringer using `go list` for the type detection, which depends on
GOROOT. Unfortunally by changing GOROOT to develop path will raise
version mismatch with internal packages.
Update #43369
Change-Id: Id81334ea5f1ecdbfa81eb2d162944d65664ce727
Reviewed-on: https://go-review.googlesource.com/c/go/+/280572
Trust: Meng Zhuo <mzh@golangcn.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/types')
-rw-r--r-- | src/cmd/compile/internal/types/alg.go | 2 | ||||
-rw-r--r-- | src/cmd/compile/internal/types/algkind_string.go | 2 | ||||
-rw-r--r-- | src/cmd/compile/internal/types/goversion.go | 2 | ||||
-rw-r--r-- | src/cmd/compile/internal/types/kind_string.go (renamed from src/cmd/compile/internal/types/etype_string.go) | 12 | ||||
-rw-r--r-- | src/cmd/compile/internal/types/type.go | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/src/cmd/compile/internal/types/alg.go b/src/cmd/compile/internal/types/alg.go index 14200e0d16..f1a472cca5 100644 --- a/src/cmd/compile/internal/types/alg.go +++ b/src/cmd/compile/internal/types/alg.go @@ -10,7 +10,7 @@ import "cmd/compile/internal/base" // hashing a Type. type AlgKind int -//go:generate stringer -type AlgKind -trimprefix A +//go:generate stringer -type AlgKind -trimprefix A alg.go const ( // These values are known by runtime. diff --git a/src/cmd/compile/internal/types/algkind_string.go b/src/cmd/compile/internal/types/algkind_string.go index 8c5a0bc287..a1b518e4dd 100644 --- a/src/cmd/compile/internal/types/algkind_string.go +++ b/src/cmd/compile/internal/types/algkind_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type AlgKind -trimprefix A"; DO NOT EDIT. +// Code generated by "stringer -type AlgKind -trimprefix A alg.go"; DO NOT EDIT. package types diff --git a/src/cmd/compile/internal/types/goversion.go b/src/cmd/compile/internal/types/goversion.go index 2265f472cf..1a324aa42f 100644 --- a/src/cmd/compile/internal/types/goversion.go +++ b/src/cmd/compile/internal/types/goversion.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:generate go run mkbuiltin.go - package types import ( diff --git a/src/cmd/compile/internal/types/etype_string.go b/src/cmd/compile/internal/types/kind_string.go index e7698296ab..1e1e846240 100644 --- a/src/cmd/compile/internal/types/etype_string.go +++ b/src/cmd/compile/internal/types/kind_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type EType -trimprefix T"; DO NOT EDIT. +// Code generated by "stringer -type Kind -trimprefix T type.go"; DO NOT EDIT. package types @@ -48,13 +48,13 @@ func _() { _ = x[NTYPE-37] } -const _EType_name = "xxxINT8UINT8INT16UINT16INT32UINT32INT64UINT64INTUINTUINTPTRCOMPLEX64COMPLEX128FLOAT32FLOAT64BOOLPTRFUNCSLICEARRAYSTRUCTCHANMAPINTERFORWANYSTRINGUNSAFEPTRIDEALNILBLANKFUNCARGSCHANARGSSSATUPLERESULTSNTYPE" +const _Kind_name = "xxxINT8UINT8INT16UINT16INT32UINT32INT64UINT64INTUINTUINTPTRCOMPLEX64COMPLEX128FLOAT32FLOAT64BOOLPTRFUNCSLICEARRAYSTRUCTCHANMAPINTERFORWANYSTRINGUNSAFEPTRIDEALNILBLANKFUNCARGSCHANARGSSSATUPLERESULTSNTYPE" -var _EType_index = [...]uint8{0, 3, 7, 12, 17, 23, 28, 34, 39, 45, 48, 52, 59, 68, 78, 85, 92, 96, 99, 103, 108, 113, 119, 123, 126, 131, 135, 138, 144, 153, 158, 161, 166, 174, 182, 185, 190, 197, 202} +var _Kind_index = [...]uint8{0, 3, 7, 12, 17, 23, 28, 34, 39, 45, 48, 52, 59, 68, 78, 85, 92, 96, 99, 103, 108, 113, 119, 123, 126, 131, 135, 138, 144, 153, 158, 161, 166, 174, 182, 185, 190, 197, 202} func (i Kind) String() string { - if i >= Kind(len(_EType_index)-1) { - return "EType(" + strconv.FormatInt(int64(i), 10) + ")" + if i >= Kind(len(_Kind_index)-1) { + return "Kind(" + strconv.FormatInt(int64(i), 10) + ")" } - return _EType_name[_EType_index[i]:_EType_index[i+1]] + return _Kind_name[_Kind_index[i]:_Kind_index[i+1]] } diff --git a/src/cmd/compile/internal/types/type.go b/src/cmd/compile/internal/types/type.go index b5557b492e..6feedbfabc 100644 --- a/src/cmd/compile/internal/types/type.go +++ b/src/cmd/compile/internal/types/type.go @@ -33,9 +33,9 @@ type VarObject interface { RecordFrameOffset(int64) // save frame offset } -//go:generate stringer -type EType -trimprefix T +//go:generate stringer -type Kind -trimprefix T type.go -// EType describes a kind of type. +// Kind describes a kind of type. type Kind uint8 const ( |