---

yaml
---
r: 343549
b: refs/heads/master-rebranch
c: 666c000
h: refs/heads/master
i:
  343547: 989f9d6

Author: theblixguy

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: ab1184208a1fee3637ad97e0d3c4175606071ddd
+refs/heads/master-rebranch: 666c000607214d1fb42b4157e468e78b9d0bb779
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/Sema/CSDiagnostics.cpp

@@ -20,6 +20,7 @@
 #include "TypoCorrection.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
+#include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/Initializer.h"
@@ -2452,12 +2453,7 @@ bool ContextualFailure::tryProtocolConformanceFixIt(
   // is a struct), then bail out instead of offering a broken fix-it later on.
   auto requiresClass = false;
   if (unwrappedToType->isExistentialType()) {
-    if (auto protocolTy = unwrappedToType->getAs<ProtocolType>()) {
-      requiresClass = protocolTy->requiresClass();
-    } else if (auto compositionTy =
-                   unwrappedToType->getAs<ProtocolCompositionType>()) {
-      requiresClass = compositionTy->requiresClass();
-    }
+    requiresClass = unwrappedToType->getExistentialLayout().requiresClass();
   }
   if (requiresClass && !FromType->is<ClassType>()) {
     return false;
@@ -2486,7 +2482,6 @@ bool ContextualFailure::tryProtocolConformanceFixIt(
         missingProtoTypeStrings.push_back(memberTy->getString());
       }
     }
-
     // If we don't conform to all of the protocols in the composition, then
     // store the composition type only. This is because we need to append
     // 'Foo & Bar' instead of 'Foo, Bar' in order to match the written type.