cmd/compile: change iexportVersionGeneric to 2

Don't expect/allow generics-related info in iexportVersion 1, now that
we increased the export version to 2.

Fixes #49853

Change-Id: I9bacee7f8e7cb9bb3b02a00084fad77edd220121
Reviewed-on: https://go-review.googlesource.com/c/go/+/367634
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>

diff --git a/src/cmd/compile/internal/importer/iimport.go b/src/cmd/compile/internal/importer/iimport.go
index 1aa3b7b6a8e21a776d6a37159c2acd063bdf5aa5..23d6ca350e731b9e35f625273dc54b331ae2e63f 100644 (file)
--- a/src/cmd/compile/internal/importer/iimport.go
+++ b/src/cmd/compile/internal/importer/iimport.go
@@ -45,7 +45,7 @@ func (r *intReader) uint64() uint64 {
 const (
        iexportVersionGo1_11   = 0
        iexportVersionPosCol   = 1
-       iexportVersionGenerics = 1 // probably change to 2 before release
+       iexportVersionGenerics = 2
        iexportVersionGo1_18   = 2
 
        iexportVersionCurrent = 2

diff --git a/src/cmd/compile/internal/typecheck/iexport.go b/src/cmd/compile/internal/typecheck/iexport.go
index 9bd1f626fe55ac310769340da43face3ad80bb1b..7ebabe7314536694e9f13e7cc974c5d6eba4f0af 100644 (file)
--- a/src/cmd/compile/internal/typecheck/iexport.go
+++ b/src/cmd/compile/internal/typecheck/iexport.go
@@ -261,7 +261,7 @@ import (
 const (
        iexportVersionGo1_11   = 0
        iexportVersionPosCol   = 1
-       iexportVersionGenerics = 1 // probably change to 2 before release
+       iexportVersionGenerics = 2
        iexportVersionGo1_18   = 2
 
        iexportVersionCurrent = 2

diff --git a/src/go/internal/gcimporter/iimport.go b/src/go/internal/gcimporter/iimport.go
index 49ea64392a578de274eb1c249c625f3f8f74247f..d7fc3ee7a9980e2426e7adf8f0015e0ae77d8ee7 100644 (file)
--- a/src/go/internal/gcimporter/iimport.go
+++ b/src/go/internal/gcimporter/iimport.go
@@ -46,7 +46,7 @@ func (r *intReader) uint64() uint64 {
 const (
        iexportVersionGo1_11   = 0
        iexportVersionPosCol   = 1
-       iexportVersionGenerics = 1 // probably change to 2 before release
+       iexportVersionGenerics = 2
        iexportVersionGo1_18   = 2
 
        iexportVersionCurrent = 2