[dev.typeparams] merge master (2f0da6d) into dev.typeparams

[gostls13.git] / src / go / types / predicates.go

diff --git a/src/go/types/predicates.go b/src/go/types/predicates.go
index 023327496713611ecdf27ea3cffbae36f80caf4f..7a99c1ff99750b5288ea3cb1cb9752b41a50eca2 100644 (file)
--- a/src/go/types/predicates.go
+++ b/src/go/types/predicates.go
@@ -8,7 +8,6 @@ package types
 
 import (
        "go/token"
-       "sort"
 )
 
 // isNamed reports whether typ has a name.
@@ -330,8 +329,8 @@ func (check *Checker) identical0(x, y Type, cmpTags bool, p *ifacePair) bool {
                                        p = p.prev
                                }
                                if debug {
-                                       assert(sort.IsSorted(byUniqueMethodName(a)))
-                                       assert(sort.IsSorted(byUniqueMethodName(b)))
+                                       assertSortedMethods(a)
+                                       assertSortedMethods(b)
                                }
                                for i, f := range a {
                                        g := b[i]