languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-06 08:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dev.typeparams] cmd/compile: change export version to 1.17 for testing

Browse source 
This is a temporary change. We will revert this back before the 1.18
release. We make this change now to simplify testing, since a lot of
tools will break on the new export version.

Updates #47654.

Change-Id: I0650fa753bb11229c71254d779dd61b5c1af9cdf
Reviewed-on: https://go-review.googlesource.com/c/go/+/341211
Trust: Dan Scales <danscales@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Dan Scales 2021-08-10 12:49:21 -07:00
parent d7d4f28a06
commit 8ab59d812a
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cmd/compile/internal/importer/iimport.go
View file

@ -43,12 +43,12 @@ func (r *intReader) uint64() uint64 {
// Keep this in sync with constants in iexport.go.
const (
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
iexportVersionGenerics = 2
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
// TODO: before release, change this back to 2.
iexportVersionGenerics = iexportVersionPosCol
// Start of the unstable series of versions, remove "+ n" before release.
iexportVersionCurrent = iexportVersionGenerics + 1
iexportVersionCurrent = iexportVersionGenerics
)
type ident struct {
@ -99,7 +99,7 @@ func ImportData(imports map[string]*types2.Package, data, path string) (pkg *typ
version = int64(r.uint64())
switch version {
case currentVersion, iexportVersionPosCol, iexportVersionGo1_11:
case /* iexportVersionGenerics, */ iexportVersionPosCol, iexportVersionGo1_11:
default:
if version > iexportVersionGenerics {
errorf("unstable iexport format version %d, just rebuild compiler and std library", version)

11
src/cmd/compile/internal/typecheck/iexport.go
View file

@ -226,12 +226,13 @@ import (
// 1: added column details to Pos
// 2: added information for generic function/types (currently unstable)
const (
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
iexportVersionGenerics = 2
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
// TODO: before release, change this back to 2. Kept at previous version
// for now (for testing).
iexportVersionGenerics = iexportVersionPosCol
// Start of the unstable series of versions, remove "+ n" before release.
iexportVersionCurrent = iexportVersionGenerics + 1
iexportVersionCurrent = iexportVersionGenerics
)
// predeclReserved is the number of type offsets reserved for types

2
src/cmd/compile/internal/typecheck/iimport.go
View file

@ -119,7 +119,7 @@ func ReadImports(pkg *types.Pkg, data string) {
version := ird.uint64()
switch version {
case iexportVersionCurrent, iexportVersionPosCol, iexportVersionGo1_11:
case /* iexportVersionGenerics, */ iexportVersionPosCol, iexportVersionGo1_11:
default:
if version > iexportVersionGenerics {
base.Errorf("import %q: unstable export format version %d, just recompile", pkg.Path, version)

12
src/go/internal/gcimporter/iimport.go
View file

@ -43,12 +43,12 @@ func (r *intReader) uint64() uint64 {
// Keep this in sync with constants in iexport.go.
const (
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
iexportVersionGenerics = 2
iexportVersionGo1_11 = 0
iexportVersionPosCol = 1
// TODO: before release, change this back to 2.
iexportVersionGenerics = iexportVersionPosCol
// Start of the unstable series of versions, remove "+ n" before release.
iexportVersionCurrent = iexportVersionGenerics + 1
iexportVersionCurrent = iexportVersionGenerics
)
const predeclReserved = 32
@ -91,7 +91,7 @@ func iImportData(fset *token.FileSet, imports map[string]*types.Package, dataRea
version = int64(r.uint64())
switch version {
case currentVersion, iexportVersionPosCol, iexportVersionGo1_11:
case /* iexportVersionGenerics, */ iexportVersionPosCol, iexportVersionGo1_11:
default:
if version > iexportVersionGenerics {
errorf("unstable iexport format version %d, just rebuild compiler and std library", version)