Merge pull request swiftlang#13944 from davezarzycki/nfc_find_optionals_elems_via_sema

Author: swift-ci

include/swift/AST/Decl.h

@@ -3079,6 +3079,11 @@ class EnumDecl final : public NominalTypeDecl {
     return result;
   }
 
+  /// If this enum has a unique element, return it. A unique element can
+  /// either hold a value or not, and the existence of one unique element does
+  /// not imply the existence or non-existence of the opposite unique element.
+  EnumElementDecl *getUniqueElement(bool hasValue) const;
+
   /// Return a range that iterates over all the cases of an enum.
   CaseRange getAllCases() const {
     return CaseRange(getMembers());
@@ -6522,6 +6527,20 @@ inline DeclContext *DeclContext::castDeclToDeclContext(const Decl *D) {
   }
 }
 
+inline EnumElementDecl *EnumDecl::getUniqueElement(bool hasValue) const {
+  EnumElementDecl *result = nullptr;
+  bool found = false;
+  for (auto elt : getAllElements()) {
+    if (elt->hasAssociatedValues() == hasValue) {
+      if (found)
+        return nullptr;
+      found = true;
+      result = elt;
+    }
+  }
+  return result;
+}
+
 } // end namespace swift
 
 #endif

include/swift/AST/KnownIdentifiers.def

@@ -72,7 +72,6 @@ IDENTIFIER(makeIterator)
 IDENTIFIER(Iterator)
 IDENTIFIER(load)
 IDENTIFIER(next)
-IDENTIFIER(none)
 IDENTIFIER_(nsErrorDomain)
 IDENTIFIER(objectAtIndexedSubscript)
 IDENTIFIER(objectForKeyedSubscript)
@@ -89,7 +88,6 @@ IDENTIFIER(self)
 IDENTIFIER(Self)
 IDENTIFIER(setObject)
 IDENTIFIER(simd)
-IDENTIFIER(some)
 IDENTIFIER(storage)
 IDENTIFIER(stringValue)
 IDENTIFIER(super)

lib/AST/ASTContext.cpp

@@ -651,14 +651,6 @@ EnumDecl *ASTContext::getOptionalDecl(OptionalTypeKind kind) const {
   llvm_unreachable("Unhandled OptionalTypeKind in switch.");
 }
 
-static EnumElementDecl *findEnumElement(EnumDecl *e, Identifier name) {
-  for (auto elt : e->getAllElements()) {
-    if (elt->getName() == name)
-      return elt;
-  }
-  return nullptr;
-}
-
 EnumElementDecl *ASTContext::getOptionalSomeDecl(OptionalTypeKind kind) const {
   switch (kind) {
   case OTK_Optional:
@@ -685,27 +677,27 @@ EnumElementDecl *ASTContext::getOptionalNoneDecl(OptionalTypeKind kind) const {
 
 EnumElementDecl *ASTContext::getOptionalSomeDecl() const {
   if (!Impl.OptionalSomeDecl)
-    Impl.OptionalSomeDecl = findEnumElement(getOptionalDecl(), Id_some);
+    Impl.OptionalSomeDecl = getOptionalDecl()->getUniqueElement(/*hasVal*/true);
   return Impl.OptionalSomeDecl;
 }
 
 EnumElementDecl *ASTContext::getOptionalNoneDecl() const {
   if (!Impl.OptionalNoneDecl)
-    Impl.OptionalNoneDecl = findEnumElement(getOptionalDecl(), Id_none);
+    Impl.OptionalNoneDecl =getOptionalDecl()->getUniqueElement(/*hasVal*/false);
   return Impl.OptionalNoneDecl;
 }
 
 EnumElementDecl *ASTContext::getImplicitlyUnwrappedOptionalSomeDecl() const {
   if (!Impl.ImplicitlyUnwrappedOptionalSomeDecl)
     Impl.ImplicitlyUnwrappedOptionalSomeDecl =
-      findEnumElement(getImplicitlyUnwrappedOptionalDecl(), Id_some);
+      getImplicitlyUnwrappedOptionalDecl()->getUniqueElement(/*hasVal*/true);
   return Impl.ImplicitlyUnwrappedOptionalSomeDecl;
 }
 
 EnumElementDecl *ASTContext::getImplicitlyUnwrappedOptionalNoneDecl() const {
   if (!Impl.ImplicitlyUnwrappedOptionalNoneDecl)
     Impl.ImplicitlyUnwrappedOptionalNoneDecl =
-      findEnumElement(getImplicitlyUnwrappedOptionalDecl(), Id_none);
+      getImplicitlyUnwrappedOptionalDecl()->getUniqueElement(/*hasVal*/false);
   return Impl.ImplicitlyUnwrappedOptionalNoneDecl;
 }
 

lib/Sema/TypeCheckPattern.cpp

@@ -1231,10 +1231,11 @@ bool TypeChecker::coercePatternToType(Pattern *&P, DeclContext *dc, Type type,
     if (numExtraOptionals > 0) {
       Pattern *sub = IP;
       for (int i = 0; i < numExtraOptionals; ++i) {
+        auto some = Context.getOptionalDecl()->getUniqueElement(/*hasVal*/true);
         sub = new (Context) EnumElementPattern(TypeLoc(),
                                                IP->getStartLoc(),
                                                IP->getEndLoc(),
-                                               Context.Id_some,
+                                               some->getName(),
                                                nullptr, sub,
                                                /*Implicit=*/true);
       }