RequirementMachine: Remove Symbol::getSuperclass()

Author: slavapestov

lib/AST/RequirementMachine/PropertyMap.cpp

@@ -154,7 +154,7 @@ Type PropertyBag::getSuperclassBound(
     const MutableTerm &lookupTerm,
     const PropertyMap &map) const {
   MutableTerm prefix = getPrefixAfterStrippingKey(lookupTerm);
-  return map.getTypeFromSubstitutionSchema(Superclass->getSuperclass(),
+  return map.getTypeFromSubstitutionSchema(Superclass->getConcreteType(),
                                            Superclass->getSubstitutions(),
                                            genericParams, prefix);
 }

lib/AST/RequirementMachine/PropertyMap.h

@@ -106,7 +106,7 @@ class PropertyBag {
   }
 
   CanType getSuperclassBound() const {
-    return Superclass->getSuperclass();
+    return Superclass->getConcreteType();
   }
 
   Type getSuperclassBound(

lib/AST/RequirementMachine/PropertyUnification.cpp

@@ -312,8 +312,8 @@ static std::pair<Symbol, bool> unifySuperclasses(
     llvm::dbgs() << "% Unifying " << lhs << " with " << rhs << "\n";
   }
 
-  auto lhsType = lhs.getSuperclass();
-  auto rhsType = rhs.getSuperclass();
+  auto lhsType = lhs.getConcreteType();
+  auto rhsType = rhs.getConcreteType();
 
   auto *lhsClass = lhsType.getClassOrBoundGenericClass();
   assert(lhsClass != nullptr);
@@ -425,7 +425,7 @@ void PropertyMap::addProperty(
       // A rule (T.[superclass: C] => T) induces a rule (T.[layout: L] => T),
       // where L is either AnyObject or _NativeObject.
       auto superclass =
-          property.getSuperclass()->getClassOrBoundGenericClass();
+          property.getConcreteType()->getClassOrBoundGenericClass();
       auto layout =
           LayoutConstraint::getLayoutConstraint(
             superclass->getLayoutConstraintKind(),
@@ -579,7 +579,7 @@ void PropertyMap::concretizeNestedTypesFromConcreteParents() {
           props->getKey(),
           RequirementKind::Superclass,
           *props->SuperclassRule,
-          props->Superclass->getSuperclass(),
+          props->Superclass->getConcreteType(),
           props->Superclass->getSubstitutions(),
           props->ConformsToRules,
           props->ConformsTo,

lib/AST/RequirementMachine/RequirementMachineRequests.cpp

@@ -126,7 +126,7 @@ RequirementMachine::buildRequirementsFromRules(
         // For compatibility with the old GenericSignatureBuilder, drop requirements
         // containing ErrorTypes.
         auto superclassType = Map.getTypeFromSubstitutionSchema(
-                                prop->getSuperclass(),
+                                prop->getConcreteType(),
                                 prop->getSubstitutions(),
                                 genericParams, MutableTerm());
         if (superclassType->hasError())

lib/AST/RequirementMachine/Symbol.cpp

@@ -198,15 +198,11 @@ LayoutConstraint Symbol::getLayoutConstraint() const {
   return Ptr->Layout;
 }
 
-/// Get the superclass type associated with a superclass symbol.
-CanType Symbol::getSuperclass() const {
-  assert(getKind() == Kind::Superclass);
-  return Ptr->ConcreteType;
-}
-
-/// Get the concrete type associated with a concrete type symbol.
+/// Get the concrete type associated with a superclass, concrete type or
+/// concrete conformance symbol.
 CanType Symbol::getConcreteType() const {
-  assert(getKind() == Kind::ConcreteType ||
+  assert(getKind() == Kind::Superclass ||
+         getKind() == Kind::ConcreteType ||
          getKind() == Kind::ConcreteConformance);
   return Ptr->ConcreteType;
 }
@@ -635,10 +631,7 @@ int Symbol::compare(Symbol other, RewriteContext &ctx) const {
 
   case Kind::Superclass:
   case Kind::ConcreteType: {
-    if (kind == Kind::Superclass
-        ? (getSuperclass() == other.getSuperclass())
-        : (getConcreteType() == other.getConcreteType())) {
-
+    if (getConcreteType() == other.getConcreteType()) {
       // If the concrete types are identical, compare substitution terms.
       assert(getSubstitutions().size() == other.getSubstitutions().size());
       for (unsigned i : indices(getSubstitutions())) {
@@ -676,7 +669,7 @@ Symbol Symbol::withConcreteSubstitutions(
     RewriteContext &ctx) const {
   switch (getKind()) {
   case Kind::Superclass:
-    return Symbol::forSuperclass(getSuperclass(), substitutions, ctx);
+    return Symbol::forSuperclass(getConcreteType(), substitutions, ctx);
 
   case Kind::ConcreteType:
     return Symbol::forConcreteType(getConcreteType(), substitutions, ctx);
@@ -787,7 +780,7 @@ void Symbol::dump(llvm::raw_ostream &out) const {
     return;
 
   case Kind::Superclass:
-    out << "[superclass: " << getSuperclass();
+    out << "[superclass: " << getConcreteType();
     dumpSubstitutions();
     out << "]";
     return;

lib/AST/RequirementMachine/Symbol.h

@@ -175,8 +175,6 @@ class Symbol final {
 
   LayoutConstraint getLayoutConstraint() const;
 
-  CanType getSuperclass() const;
-
   CanType getConcreteType() const;
 
   ArrayRef<Term> getSubstitutions() const;