Merge pull request #14387 from rudkx/CanType-getOptionalObjectType

Add CanType::getOptionalObjectType for staging a rename.

Author: rudkx

include/swift/AST/Type.h

@@ -391,6 +391,7 @@ class CanType : public Type {
   static bool isObjCExistentialTypeImpl(CanType type);
   static CanType getAnyOptionalObjectTypeImpl(CanType type,
                                               OptionalTypeKind &kind);
+  static CanType getOptionalObjectTypeImpl(CanType type);
   static CanType getReferenceStorageReferentImpl(CanType type);
   static CanType getWithoutSpecifierTypeImpl(CanType type);
 
@@ -457,6 +458,10 @@ class CanType : public Type {
   NominalTypeDecl *getAnyNominal() const;
   GenericTypeDecl *getAnyGeneric() const;
 
+  CanType getOptionalObjectType() const {
+    return getOptionalObjectTypeImpl(*this);
+  }
+
   CanType getAnyOptionalObjectType() const {
     OptionalTypeKind kind;
     return getAnyOptionalObjectTypeImpl(*this, kind);

lib/AST/Type.cpp

@@ -526,6 +526,13 @@ CanType CanType::getAnyOptionalObjectTypeImpl(CanType type,
   return CanType();
 }
 
+CanType CanType::getOptionalObjectTypeImpl(CanType type) {
+  if (auto boundTy = dyn_cast<BoundGenericEnumType>(type))
+    if (boundTy->getDecl()->classifyAsOptionalType() == OTK_Optional)
+      return boundTy.getGenericArgs()[0];
+  return CanType();
+}
+
 Type TypeBase::getAnyPointerElementType(PointerTypeKind &PTK) {
   auto &C = getASTContext();
   if (auto nominalTy = getAs<NominalType>()) {