[dev.typeparams] cmd/compile: move def of comparable to end of predeclared slices

This avoids changing the export ABI.

Change-Id: I58950c1f4c21859d91d66d352b88e8c0972b5b8c
Reviewed-on: https://go-review.googlesource.com/c/go/+/333164
Trust: Dan Scales <danscales@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>

diff --git a/src/cmd/compile/internal/importer/support.go b/src/cmd/compile/internal/importer/support.go
index 7eecae15a62d2e42ca0c0d25e2d33282dffaf8f4..6ceb413601f0e83abd87cf42619b4b4104b87781 100644 (file)
--- a/src/cmd/compile/internal/importer/support.go
+++ b/src/cmd/compile/internal/importer/support.go
@@ -101,8 +101,6 @@ var predeclared = []types2.Type{
 
        // error
        types2.Universe.Lookup("error").Type(),
-       // comparable
-       types2.Universe.Lookup("comparable").Type(),
 
        // untyped types
        types2.Typ[types2.UntypedBool],
@@ -121,6 +119,9 @@ var predeclared = []types2.Type{
 
        // used internally by gc; never used by this package or in .a files
        anyType{},
+
+       // comparable
+       types2.Universe.Lookup("comparable").Type(),
 }
 
 type anyType struct{}

diff --git a/src/cmd/compile/internal/typecheck/bexport.go b/src/cmd/compile/internal/typecheck/bexport.go
index 45d67f6ea23bc5302426d6c63a9c3cbffe1f5315..cc7f91f9372af4665131f801bf459cde47dd0aac 100644 (file)
--- a/src/cmd/compile/internal/typecheck/bexport.go
+++ b/src/cmd/compile/internal/typecheck/bexport.go
@@ -78,8 +78,6 @@ func predeclared() []*types.Type {
 
                        // error
                        types.ErrorType,
-                       // comparable
-                       types.ComparableType,
 
                        // untyped types
                        types.UntypedBool,
@@ -98,6 +96,9 @@ func predeclared() []*types.Type {
 
                        // any type, for builtin export data
                        types.Types[types.TANY],
+
+                       // comparable
+                       types.ComparableType,
                }
        }
        return predecl

diff --git a/src/go/internal/gcimporter/support.go b/src/go/internal/gcimporter/support.go
index bb2058172ac9fbea0649b0f71e47121f8116ca65..09810dd85b8b5949550b729debdbc5e7f04690cf 100644 (file)
--- a/src/go/internal/gcimporter/support.go
+++ b/src/go/internal/gcimporter/support.go
@@ -104,8 +104,6 @@ var predeclared = []types.Type{
 
        // error
        types.Universe.Lookup("error").Type(),
-       // comparable
-       types.Universe.Lookup("comparable").Type(),
 
        // untyped types
        types.Typ[types.UntypedBool],
@@ -124,6 +122,9 @@ var predeclared = []types.Type{
 
        // used internally by gc; never used by this package or in .a files
        anyType{},
+
+       // comparable
+       types.Universe.Lookup("comparable").Type(),
 }
 
 type anyType struct{}