public storage with private accessor is also a problem

Author: aschwaighofer

lib/Serialization/Serialization.cpp

@@ -2703,14 +2703,14 @@ void Serializer::writeDecl(const Decl *D) {
         access <= swift::AccessLevel::FilePrivate &&
         !value->getDeclContext()->isLocalContext();
 
-    // Emit the the filename for private mapping for private decls or internal
+    // Emit the the filename for private mapping for private decls and
     // decls with private accessors if compiled with -enable-private-imports.
     bool shouldEmitFilenameForPrivate =
         M->arePrivateImportsEnabled() &&
         !value->getDeclContext()->isLocalContext() &&
         (access <= swift::AccessLevel::FilePrivate ||
          (storage &&
-          storage->getFormalAccess() == swift::AccessLevel::Internal &&
+          storage->getFormalAccess() >= swift::AccessLevel::Internal &&
           storage->hasPrivateAccessor()));
 
     if (shouldEmitFilenameForPrivate || shouldEmitPrivateDescriminator) {

test/Serialization/Inputs/private_import_other.swift

@@ -12,4 +12,6 @@ extension Value {
 struct Internal {
     private(set) var internalVarWithPrivateSetter : Int = 0
     fileprivate(set) var internalVarWithFilePrivateSetter : Int = 0
+    public private(set) var publicVarWithPrivateSetter : Int = 0
+    public fileprivate(set) var publicVarWithFilePrivateSetter : Int = 0
 }

test/Serialization/private_import.swift

@@ -45,6 +45,8 @@
     mutating func set() {
       self.internalVarWithPrivateSetter = 1
       self.internalVarWithFilePrivateSetter = 1
+      self.publicVarWithPrivateSetter = 1
+      self.publicVarWithFilePrivateSetter = 1
     }
   }