[TypeResolver] Don't use ExistentialType for Any and AnyObject for

now.

Author: hborla

lib/AST/ASTDemangler.cpp

@@ -590,7 +590,8 @@ Type ASTBuilder::createProtocolCompositionType(
   if (superclass && superclass->getClassOrBoundGenericClass())
     members.push_back(superclass);
   Type composition = ProtocolCompositionType::get(Ctx, members, isClassBound);
-  if (Ctx.LangOpts.EnableExplicitExistentialTypes) {
+  if (Ctx.LangOpts.EnableExplicitExistentialTypes &&
+      !(composition->isAny() || composition->isAnyObject())) {
     composition = ExistentialType::get(composition);
   }
   return composition;

lib/Sema/TypeCheckType.cpp

@@ -3364,8 +3364,9 @@ TypeResolver::resolveIdentifierType(IdentTypeRepr *IdType,
     return ErrorType::get(getASTContext());
   }
 
-  bool isConstraintType = (result->is<ProtocolType>() ||
-                           result->is<ProtocolCompositionType>());
+  // FIXME: Don't use ExistentialType for AnyObject for now.
+  bool isConstraintType = (result->is<ProtocolType>() &&
+                           !result->isAnyObject());
   if (isConstraintType &&
       getASTContext().LangOpts.EnableExplicitExistentialTypes &&
       options.isConstraintImplicitExistential()) {
@@ -3738,7 +3739,8 @@ TypeResolver::resolveCompositionType(CompositionTypeRepr *repr,
       ProtocolCompositionType::get(getASTContext(), Members,
                                    /*HasExplicitAnyObject=*/false);
   if (getASTContext().LangOpts.EnableExplicitExistentialTypes &&
-      options.isConstraintImplicitExistential()) {
+      options.isConstraintImplicitExistential() &&
+      !composition->isAny()) {
     composition = ExistentialType::get(composition);
   }
   return composition;
@@ -3767,6 +3769,7 @@ TypeResolver::resolveExistentialType(ExistentialTypeRepr *repr,
     diagnose(repr->getLoc(), diag::unnecessary_any,
              constraintType)
       .fixItRemove({anyStart, anyEnd});
+    return constraintType;
   }
 
   return ExistentialType::get(constraintType);
@@ -3954,7 +3957,7 @@ class ExistentialTypeVisitor
     // Arbitrary protocol constraints are okay for 'any' types.
     if (isa<ExistentialTypeRepr>(T))
       return false;
-    
+
     visit(T);
     return true;
   }