Merge pull request #16488 from slavapestov/fix-resilience-bypass-again

 IRGen: Fix enum lowering with -enable-resilience-bypass

Author: slavapestov

lib/IRGen/GenDecl.cpp

@@ -4062,8 +4062,10 @@ IRGenModule::getAddrOfGlobalUTF16ConstantString(StringRef utf8) {
 /// - For classes, the superclass might change the size or number
 ///   of stored properties
 bool IRGenModule::isResilient(NominalTypeDecl *D, ResilienceExpansion expansion) {
-  if (Types.isCompletelyFragile())
+  if (expansion == ResilienceExpansion::Maximal &&
+      Types.isCompletelyFragile()) {
     return false;
+  }
   return D->isResilient(getSwiftModule(), expansion);
 }
 

lib/IRGen/GenEnum.cpp

@@ -5145,7 +5145,7 @@ EnumImplStrategy::get(TypeConverter &TC, SILType type, EnumDecl *theEnum) {
         // can reproduce.
         if (!substArgTI->isFixedSize(layoutScope)) {
           alwaysFixedSize = IsNotFixedSize;
-          allowFixedLayoutOptimizations = false;
+          assert(!allowFixedLayoutOptimizations);
         }
       }
     }

test/IRGen/Inputs/resilience_bypass/first.swift

@@ -0,0 +1,9 @@
+public class C {}
+
+public struct S {
+  public let c: C
+
+  public init() {
+    self.c = C()
+  }
+}

test/IRGen/Inputs/resilience_bypass/second.swift

@@ -0,0 +1,6 @@
+import first
+
+public enum E {
+  case a(S)
+  case b(S)
+}

test/IRGen/resilience_bypass.swift

@@ -0,0 +1,16 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/first.swiftmodule -module-name=first %S/Inputs/resilience_bypass/first.swift
+// RUN: %target-swift-frontend -emit-module -emit-module-path=%t/second.swiftmodule -module-name=second %S/Inputs/resilience_bypass/second.swift -I %t
+// RUN: %target-swift-frontend -emit-ir -enable-resilience-bypass %s -I %t | %FileCheck %s -DINT=i%target-ptrsize
+
+import second
+
+// CHECK:       define{{( protected)?}} swiftcc [[INT]] @"$S17resilience_bypass7getSizeSiyF"() {{.*}} {
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    ret [[INT]] {{5|9}}
+// CHECK-NEXT:  }
+
+public func getSize() -> Int {
+  return MemoryLayout<E>.size
+}