[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 7eecae1..6ceb413 100644
--- a/src/cmd/compile/internal/importer/support.go
+++ b/src/cmd/compile/internal/importer/support.go
@@ -101,8 +101,6 @@
// error
types2.Universe.Lookup("error").Type(),
- // comparable
- types2.Universe.Lookup("comparable").Type(),
// untyped types
types2.Typ[types2.UntypedBool],
@@ -121,6 +119,9 @@
// 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 45d67f6..cc7f91f 100644
--- a/src/cmd/compile/internal/typecheck/bexport.go
+++ b/src/cmd/compile/internal/typecheck/bexport.go
@@ -78,8 +78,6 @@
// error
types.ErrorType,
- // comparable
- types.ComparableType,
// untyped types
types.UntypedBool,
@@ -98,6 +96,9 @@
// 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 bb20581..09810dd 100644
--- a/src/go/internal/gcimporter/support.go
+++ b/src/go/internal/gcimporter/support.go
@@ -104,8 +104,6 @@
// error
types.Universe.Lookup("error").Type(),
- // comparable
- types.Universe.Lookup("comparable").Type(),
// untyped types
types.Typ[types.UntypedBool],
@@ -124,6 +122,9 @@
// used internally by gc; never used by this package or in .a files
anyType{},
+
+ // comparable
+ types.Universe.Lookup("comparable").Type(),
}
type anyType struct{}
