Eliminate CodableConformanceType

CodableConformanceType::TypeNotValidated is unused since the InterfaceTypeRequest changes went through.  We can just use the validity of the ProtocolConformanceRef here.

Author: CodaFi

lib/Sema/DerivedConformanceCodable.cpp

@@ -61,14 +61,6 @@ static bool superclassIsDecodable(ClassDecl *target) {
                                C.getProtocol(KnownProtocolKind::Decodable));
 }
 
-/// Represents the possible outcomes of checking whether a decl conforms to
-/// Encodable or Decodable.
-enum CodableConformanceType {
-  TypeNotValidated,
-  DoesNotConform,
-  Conforms
-};
-
 /// Returns whether the given type conforms to the given {En,De}codable
 /// protocol.
 ///
@@ -77,7 +69,7 @@ enum CodableConformanceType {
 /// \param target The \c Type to validate.
 ///
 /// \param proto The \c ProtocolDecl to check conformance to.
-static CodableConformanceType typeConformsToCodable(DeclContext *context,
+static ProtocolConformanceRef typeConformsToCodable(DeclContext *context,
                                                     Type target, bool isIUO,
                                                     ProtocolDecl *proto) {
   target = context->mapTypeIntoContext(target);
@@ -86,8 +78,7 @@ static CodableConformanceType typeConformsToCodable(DeclContext *context,
     return typeConformsToCodable(context, target->getOptionalObjectType(),
                                  false, proto);
 
-  auto conf = TypeChecker::conformsToProtocol(target, proto, context, None);
-  return conf.isInvalid() ? DoesNotConform : Conforms;
+  return TypeChecker::conformsToProtocol(target, proto, context, None);
 }
 
 /// Returns whether the given variable conforms to the given {En,De}codable
@@ -98,7 +89,7 @@ static CodableConformanceType typeConformsToCodable(DeclContext *context,
 /// \param varDecl The \c VarDecl to validate.
 ///
 /// \param proto The \c ProtocolDecl to check conformance to.
-static CodableConformanceType
+static ProtocolConformanceRef
 varConformsToCodable(DeclContext *DC, VarDecl *varDecl, ProtocolDecl *proto) {
   // If the decl doesn't yet have a type, we may be seeing it before the type
   // checker has gotten around to evaluating its type. For example:
@@ -167,22 +158,13 @@ static bool validateCodingKeysEnum(DerivedConformance &derived,
     // We have a property to map to. Ensure it's {En,De}codable.
     auto conformance =
         varConformsToCodable(conformanceDC, it->second, derived.Protocol);
-    switch (conformance) {
-      case Conforms:
-        // The property was valid. Remove it from the list.
-        properties.erase(it);
-        break;
-
-      case DoesNotConform:
-        it->second->diagnose(diag::codable_non_conforming_property_here,
-                             derived.getProtocolType(), it->second->getType());
-        LLVM_FALLTHROUGH;
-
-      case TypeNotValidated:
-        // We don't produce a diagnostic for a type which failed to validate.
-        // This will produce a diagnostic elsewhere anyway.
-        propertiesAreValid = false;
-        continue;
+    if (conformance.isInvalid()) {
+      it->second->diagnose(diag::codable_non_conforming_property_here,
+                           derived.getProtocolType(), it->second->getType());
+      propertiesAreValid = false;
+    } else {
+      // The property was valid. Remove it from the list.
+      properties.erase(it);
     }
   }
 
@@ -341,28 +323,17 @@ static EnumDecl *synthesizeCodingKeysEnum(DerivedConformance &derived) {
     // context, not the type.
     auto conformance = varConformsToCodable(derived.getConformanceContext(),
                                             varDecl, derived.Protocol);
-    switch (conformance) {
-      case Conforms:
-      {
-        auto *elt = new (C) EnumElementDecl(SourceLoc(),
-                                            getVarNameForCoding(varDecl),
-                                            nullptr, SourceLoc(), nullptr,
-                                            enumDecl);
-        elt->setImplicit();
-        enumDecl->addMember(elt);
-        break;
-      }
-
-      case DoesNotConform:
-        varDecl->diagnose(diag::codable_non_conforming_property_here,
-                          derived.getProtocolType(), varDecl->getType());
-        LLVM_FALLTHROUGH;
-
-      case TypeNotValidated:
-        // We don't produce a diagnostic for a type which failed to validate.
-        // This will produce a diagnostic elsewhere anyway.
-        allConform = false;
-        continue;
+    if (conformance.isInvalid()) {
+      varDecl->diagnose(diag::codable_non_conforming_property_here,
+                        derived.getProtocolType(), varDecl->getType());
+      allConform = false;
+    } else {
+      auto *elt = new (C) EnumElementDecl(SourceLoc(),
+                                          getVarNameForCoding(varDecl),
+                                          nullptr, SourceLoc(), nullptr,
+                                          enumDecl);
+      elt->setImplicit();
+      enumDecl->addMember(elt);
     }
   }
 
@@ -1164,7 +1135,7 @@ ValueDecl *DerivedConformance::deriveEncodable(ValueDecl *requirement) {
 }
 
 ValueDecl *DerivedConformance::deriveDecodable(ValueDecl *requirement) {
-  // We can only synthesize Encodable for structs and classes.
+  // We can only synthesize Decodable for structs and classes.
   if (!isa<StructDecl>(Nominal) && !isa<ClassDecl>(Nominal))
     return nullptr;