Merge pull request #25216 from aschwaighofer/fix_getSingletonAggregateFieldType

IRGen: getSingletonAggregateFieldType must not return field if its ac…

Author: aschwaighofer

lib/IRGen/GenType.cpp

@@ -2289,8 +2289,17 @@ SILType irgen::getSingletonAggregateFieldType(IRGenModule &IGM, SILType t,
     auto allFields = structDecl->getStoredProperties();
 
     auto field = allFields.begin();
-    if (!allFields.empty() && std::next(field) == allFields.end())
-      return t.getFieldType(*field, IGM.getSILModule());
+    if (!allFields.empty() && std::next(field) == allFields.end()) {
+      auto fieldTy = t.getFieldType(*field, IGM.getSILModule());
+      if (auto fieldDecl = fieldTy.getNominalOrBoundGenericNominal()) {
+        // The field's access level must be higher or equal to the enclosing
+        // struct's.
+        if (fieldDecl->getEffectiveAccess() >= structDecl->getEffectiveAccess())
+          return fieldTy;
+      } else {
+        return fieldTy;
+      }
+    }
 
     return SILType();
   }
@@ -2305,8 +2314,17 @@ SILType irgen::getSingletonAggregateFieldType(IRGenModule &IGM, SILType t,
 
     auto theCase = allCases.begin();
     if (!allCases.empty() && std::next(theCase) == allCases.end()
-        && (*theCase)->hasAssociatedValues())
-      return t.getEnumElementType(*theCase, IGM.getSILModule());
+        && (*theCase)->hasAssociatedValues()) {
+      auto enumEltTy = t.getEnumElementType(*theCase, IGM.getSILModule());
+      if (auto eltDecl = enumEltTy.getNominalOrBoundGenericNominal()) {
+        // The enum element's access level must be higher or equal to the
+        // enclosing struct's.
+        if (eltDecl->getEffectiveAccess() >= enumDecl->getEffectiveAccess())
+          return enumEltTy;
+      } else {
+        return enumEltTy;
+      }
+    }
 
     return SILType();
   }

test/IRGen/Inputs/metadata2.swift

@@ -0,0 +1,26 @@
+import resilient_struct
+
+struct Item {
+ var d: ResilientInt? = nil
+}
+
+struct InternalContainer {
+
+    fileprivate enum SomeEnumType {
+        case none
+        case single(Item)
+
+        init(item: [Item]) {
+            if item.count >= 1 {
+                self = .single(item.first!)
+            } else {
+                self = .none
+            }
+        }
+    }
+    private var type: SomeEnumType
+
+    init(item: [Item]) {
+        self.type = SomeEnumType(item: item)
+    }
+}

test/IRGen/metadata.swift

@@ -0,0 +1,14 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
+// RUN: %target-swift-frontend -module-name A -I %t  %S/Inputs/metadata2.swift -primary-file %s -emit-ir | %FileCheck %s
+
+// CHECK-LABEL: define {{.*}}swiftcc %swift.metadata_response @"$s1A12MyControllerCMr"(%swift.type*, i8*, i8**)
+// CHECK-NOT: ret
+// CHECK:  call swiftcc %swift.metadata_response @"$s1A17InternalContainerVMa"(
+// CHECK:  ret
+class MyController {
+  var c = InternalContainer(item: [])
+  func update(_ n: InternalContainer) {
+    c = n
+  }
+}