IDE: Use methods on TypeBase instead of going through canSatisfy()

Author: slavapestov

include/swift/Sema/IDETypeChecking.h

@@ -47,10 +47,6 @@ namespace swift {
   /// \returns true on convertible, false on not.
   bool isConvertibleTo(Type T1, Type T2, bool openArchetypes, DeclContext &DC);
 
-  bool isEqual(Type T1, Type T2, DeclContext &DC);
-
-  bool canPossiblyEqual(Type T1, Type T2, DeclContext &DC);
-
   void collectDefaultImplementationForProtocolMembers(ProtocolDecl *PD,
                         llvm::SmallDenseMap<ValueDecl*, ValueDecl*> &DefaultMap);
 

include/swift/Sema/IDETypeCheckingRequests.h

@@ -87,8 +87,6 @@ class IsDeclApplicableRequest:
 // Type relation checking
 //----------------------------------------------------------------------------//
 enum class TypeRelation: uint8_t {
-  EqualTo,
-  PossiblyEqualTo,
   ConvertTo,
 };
 
@@ -158,8 +156,6 @@ struct TypeRelationCheckInput {
     out << " is ";
     switch(owner.Relation) {
 #define CASE(NAME) case TypeRelation::NAME: out << #NAME << " "; break;
-    CASE(EqualTo)
-    CASE(PossiblyEqualTo)
     CASE(ConvertTo)
 #undef CASE
     }

lib/IDE/IDETypeChecking.cpp

@@ -325,7 +325,6 @@ struct SynthesizedExtensionAnalyzer::Implementation {
 
         switch (Kind) {
         case RequirementKind::Conformance:
-        case RequirementKind::Superclass:
           // FIXME: This could be more accurate; check
           // conformance instead of subtyping
           if (!isConvertibleTo(First, Second, /*openArchetypes=*/true, *DC))
@@ -335,8 +334,17 @@ struct SynthesizedExtensionAnalyzer::Implementation {
             MergeInfo.addRequirement(GenericSig, First, Second, Kind);
           break;
 
+        case RequirementKind::Superclass:
+          if (!Second->isBindableToSuperclassOf(First)) {
+            return true;
+          } else if (!Second->isExactSuperclassOf(Second)) {
+            MergeInfo.addRequirement(GenericSig, First, Second, Kind);
+          }
+          break;
+
         case RequirementKind::SameType:
-          if (!canPossiblyEqual(First, Second, *DC)) {
+          if (!First->isBindableTo(Second) &&
+              !Second->isBindableTo(First)) {
             return true;
           } else if (!First->isEqual(Second)) {
             MergeInfo.addRequirement(GenericSig, First, Second, Kind);
@@ -753,19 +761,6 @@ bool swift::isMemberDeclApplied(const DeclContext *DC, Type BaseTy,
     IsDeclApplicableRequest(DeclApplicabilityOwner(DC, BaseTy, VD)), false);
 }
 
-bool swift::canPossiblyEqual(Type T1, Type T2, DeclContext &DC) {
-   return evaluateOrDefault(DC.getASTContext().evaluator,
-     TypeRelationCheckRequest(TypeRelationCheckInput(&DC, T1, T2,
-       TypeRelation::PossiblyEqualTo, true)), false);
-}
-
-
-bool swift::isEqual(Type T1, Type T2, DeclContext &DC) {
-  return evaluateOrDefault(DC.getASTContext().evaluator,
-    TypeRelationCheckRequest(TypeRelationCheckInput(&DC, T1, T2,
-      TypeRelation::EqualTo, true)), false);
-}
-
 bool swift::isConvertibleTo(Type T1, Type T2, bool openArchetypes,
                             DeclContext &DC) {
   return evaluateOrDefault(DC.getASTContext().evaluator,

lib/Sema/IDETypeCheckingRequests.cpp

@@ -104,11 +104,6 @@ TypeRelationCheckRequest::evaluate(Evaluator &evaluator,
                                    TypeRelationCheckInput Owner) const {
   Optional<constraints::ConstraintKind> CKind;
   switch (Owner.Relation) {
-  case TypeRelation::EqualTo:
-    return Owner.Pair.FirstTy->isEqual(Owner.Pair.SecondTy);
-  case TypeRelation::PossiblyEqualTo:
-    CKind = constraints::ConstraintKind::Bind;
-    break;
   case TypeRelation::ConvertTo:
     CKind = constraints::ConstraintKind::Conversion;
     break;