diff options
| author | Russ Cox <rsc@golang.org> | 2019-04-30 15:23:14 -0400 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-05-02 20:30:31 +0000 |
| commit | 0a338f75d4c64ba72cf586a28ec1a674c8b4bb77 (patch) | |
| tree | fb096f1073d09a1a8c38aade73acb2b2e10170ba /src/cmd/compile/internal/types/sym_test.go | |
| parent | d2765de863355f8ae6e4354ae64c2099cd850382 (diff) | |
| download | go-0a338f75d4c64ba72cf586a28ec1a674c8b4bb77.tar.gz go-0a338f75d4c64ba72cf586a28ec1a674c8b4bb77.zip | |
sort: simplify bootstrap
We compile package sort as part of the compiler bootstrap,
to make sure the compiler uses a consistent sort algorithm
no matter what version of Go it is compiled against.
(This matters for elements that compare "equal" but are distinguishable.)
Package sort was compiled in such a way as to disallow
sort.Slice entirely during bootstrap (at least with some compilers),
while cmd/internal/obj was compiled in such a way as to
make obj.SortSlice available to all compilers, precisely because
sort.Slice was not. This is all highly confusing.
Simplify by making sort.Slice available all the time.
Followup to CL 169137 and #30440
(and also CL 40114 and CL 73951).
Change-Id: I127f4e02d6c71392805d256c3a90ef7c51f9ba0c
Reviewed-on: https://go-review.googlesource.com/c/go/+/174525
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/types/sym_test.go')
| -rw-r--r-- | src/cmd/compile/internal/types/sym_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/types/sym_test.go b/src/cmd/compile/internal/types/sym_test.go index a2bb02deda..94efd42aa4 100644 --- a/src/cmd/compile/internal/types/sym_test.go +++ b/src/cmd/compile/internal/types/sym_test.go @@ -6,8 +6,8 @@ package types_test import ( "cmd/compile/internal/types" - "cmd/internal/obj" "reflect" + "sort" "testing" ) @@ -50,7 +50,7 @@ func TestSymLess(t *testing.T) { if reflect.DeepEqual(data, want) { t.Fatal("data must be shuffled") } - obj.SortSlice(data, func(i, j int) bool { return data[i].Less(data[j]) }) + sort.Slice(data, func(i, j int) bool { return data[i].Less(data[j]) }) if !reflect.DeepEqual(data, want) { t.Logf("want: %#v", want) t.Logf("data: %#v", data) |