Sink the logic into getResilienceExpansionForLayout

This clearly satisfies the postcondition that 'Calling isResilient() with this scope will always return false.'

Author: aschwaighofer

lib/IRGen/GenDecl.cpp

@@ -4137,6 +4137,9 @@ IRGenModule::getResilienceExpansionForAccess(NominalTypeDecl *decl) {
 // layout. Calling isResilient() with this scope will always return false.
 ResilienceExpansion
 IRGenModule::getResilienceExpansionForLayout(NominalTypeDecl *decl) {
+  if (TC.isCompletelyFragile())
+    return ResilienceExpansion::Minimal;
+
   if (isResilient(decl, ResilienceExpansion::Minimal))
     return ResilienceExpansion::Maximal;
 

lib/IRGen/GenEnum.cpp

@@ -5258,12 +5258,6 @@ EnumImplStrategy::get(TypeConverter &TC, SILType type, EnumDecl *theEnum) {
   // fixed-size from this resilience scope.
   ResilienceExpansion layoutScope =
       TC.IGM.getResilienceExpansionForLayout(theEnum);
-  if (TC.isCompletelyFragile()) {
-    // If we forced completely fragile layout we need to check the
-    // fixed-sized'ness in the minimal scope. Otherwise, we get wrong answer for
-    // private resilient enum types that have an resilient payload.
-    layoutScope = ResilienceExpansion::Minimal;
-  }
 
   for (auto elt : theEnum->getAllElements()) {
     numElements++;