IRGen: Perform completely fragile layout for all classes, not just @objc ancestry

lib/IRGen/GenClass.cpp

@@ -141,9 +141,9 @@ namespace {
 
     unsigned NumInherited = 0;
 
-    // If the class has @objc ancestry, we lay out resiliently-typed fields
-    // as if they were fragile.
-    bool CompletelyFragileLayout = false;
+    // For now we always lay out resiliently-typed fields as if they
+    // were fragile.
+    bool CompletelyFragileLayout;
 
     // Does the class metadata require dynamic initialization above and
     // beyond what the runtime can automatically achieve?
@@ -171,6 +171,11 @@ namespace {
                        ReferenceCounting refcounting)
       : StructLayoutBuilder(IGM)
     {
+      // Perform fragile layout if Objective-C interop is enabled.
+      CompletelyFragileLayout =
+        (IGM.Context.LangOpts.EnableObjCInterop &&
+         !IGM.IRGen.Opts.EnableClassResilience);
+
       // Start by adding a heap header.
       switch (refcounting) {
       case ReferenceCounting::Native:
@@ -249,10 +254,6 @@ namespace {
         }
 
         if (superclass->hasClangNode()) {
-          // Perform fragile layout if the class has @objc ancestry.
-          if (!IGM.IRGen.Opts.EnableClassResilience)
-            CompletelyFragileLayout = true;
-
           // If the superclass was imported from Objective-C, its size is
           // not known at compile time. However, since the field offset
           // vector only stores offsets of stored properties defined in

test/IRGen/completely_fragile_class_layout.swift

@@ -0,0 +1,27 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
+// RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
+// RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience -O %s
+
+// REQUIRES: objc_interop
+
+import resilient_struct
+
+// Class has static metadata:
+// CHECK-LABEL: $S31completely_fragile_class_layout23ClassWithResilientFieldCMf
+
+// CHECK-LABEL: define swiftcc %swift.metadata_response @"$S31completely_fragile_class_layout23ClassWithResilientFieldCMa
+// CHECK: call %objc_class* @swift_getInitializedObjCClass(%objc_class* {{.*}} @"$S31completely_fragile_class_layout23ClassWithResilientFieldCMf"
+// CHECK: ret
+
+public class ClassWithResilientField {
+  var first: Int
+  var second: Size
+  var third: Int
+
+  init(x: Int, y: Size, z: Int) {
+    self.first = x
+    self.second = y
+    self.third = z
+  }
+}