Sema: Simplify TypeChecker::getDefaultType()

Author: slavapestov

lib/Sema/TypeCheckExpr.cpp

@@ -632,26 +632,27 @@ static Type lookupDefaultLiteralType(const DeclContext *dc,
   return cast<TypeAliasDecl>(TD)->getDeclaredInterfaceType();
 }
 
-static llvm::Optional<KnownProtocolKind>
-getKnownProtocolKindIfAny(const ProtocolDecl *protocol) {
-#define EXPRESSIBLE_BY_LITERAL_PROTOCOL_WITH_NAME(Id, _, __, ___)              \
-  if (protocol == TypeChecker::getProtocol(protocol->getASTContext(),          \
-                                           SourceLoc(),                        \
-                                           KnownProtocolKind::Id))             \
-    return KnownProtocolKind::Id;
-#include "swift/AST/KnownProtocols.def"
-#undef EXPRESSIBLE_BY_LITERAL_PROTOCOL_WITH_NAME
+Type TypeChecker::getDefaultType(ProtocolDecl *protocol, DeclContext *dc) {
+  auto knownKind = protocol->getKnownProtocolKind();
+  if (!knownKind)
+    return Type();
 
-  return llvm::None;
-}
+  switch (knownKind.value()) {
+#define EXPRESSIBLE_BY_LITERAL_PROTOCOL_WITH_NAME(Id, _, __, ___) \
+  case KnownProtocolKind::Id: \
+    break;
+#define PROTOCOL_WITH_NAME(Id, _) \
+  case KnownProtocolKind::Id: \
+    return Type();
 
-Type TypeChecker::getDefaultType(ProtocolDecl *protocol, DeclContext *dc) {
-  if (auto knownProtocolKindIfAny = getKnownProtocolKindIfAny(protocol)) {
-    return evaluateOrDefault(
-        protocol->getASTContext().evaluator,
-        DefaultTypeRequest{knownProtocolKindIfAny.value(), dc}, nullptr);
+#include "swift/AST/KnownProtocols.def"
+#undef EXPRESSIBLE_BY_LITERAL_PROTOCOL_WITH_NAME
+#undef PROTOCOL_WITH_NAME
   }
-  return Type();
+
+  return evaluateOrDefault(
+      protocol->getASTContext().evaluator,
+      DefaultTypeRequest{knownKind.value(), dc}, nullptr);
 }
 
 static std::pair<const char *, bool> lookupDefaultTypeInfoForKnownProtocol(